Diversity, Gender and Conflict Resolution