Faculty and administrators rarely assume their positions knowing how to manage conflict. Yet managers spend between 20 to 50 percent of their workday engaged in conflicts. Conflict is an overlooked area in the professional development of faculty and administrators. Senior level administrators such as deans and department heads and faculty development professionals are often called on to be "change agents" on their university campuses. As change agents, it is common to encounter conflict with university administrators, faculty, students, and staff when working to create a positive climate, particularly when emphasizing diversity and social justice. This manuscript will share a faculty development model for training faculty in the conflict resolution management method of mediation and discuss its implications for enhancing cross-cultural working relationships in faculty and organizational development. (Contains 4 tables.)