peacemaker
peace-mak-er
noun
A person who tries to bring about peace, especially between those in conflict.
"She was a natural peacemaker in the family arguments."
Thesaurus
Synonyms: make-peace, pacifier, reconciler, conciliator, Browning machine gun