Diversity and Conflict resolution