make-peace

(noun) someone who tries to bring peace. Synonyms: conciliator, pacifier, peacemaker, reconciler.

(verb) end hostilities. Synonyms: make peace. Example: "The brothers who had been fighting over their inheritance finally made peace."