peacemaker

n. Person who brings about peace.  peacemaking n. & adj.

n. One who makes peace by reconciling parties that are at variance.