peacemaking

noun1

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

   • Did Vietnam's school of hard knocks teach Americans to do peacemaking and state building right? — 2000