[n] someone who tries to bring peace [v] end hostilities
conciliator, pacifier, peacemaker, reconciler
war