peacemaker
conciliate
go-between
intercessor
intermediary
intermediator
makeup
mediator
patch up
reconcile
settle
appeaser