This  is the process of two people or groups in a conflict agreeing to make amends or come to a truce.

The restoration of peaceful or amicable relations between individuals who were previously in conflict with one another.

The act of bringing persons to agree together, who before, had had some difference.