conciliator
conciliator - noun
someone who tries to bring peace
conciliator - thesaurus
pacifier
peacemaker
reconciler