Conflict resolution

The process of managing and resolving conflicts between individuals or groups.