peacemaking

(noun)

noun

1. The act of reconciling two people or groups who disagree.