Old rivalries, territorial disputes and new alliances are reshaping the conflict in Ethiopiaβs north.