Peacemaker

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