What is conflict resolution?

making a resolution to avoid disagreements
finding a peaceful solution to a disagreement
creating relationships without disagreements
avoiding individuals with whom one disagrees