peacemaking

noun

The act of reconciling two people or groups who disagree.