Conflict resolution

Discussing with conflicting parties to reach a peaceful solution to a problem or disagreement.