The Resolution of Ethnic Conflict: Towards a Typology