peacemaker

/ˈpiːsˌmeɪkər/
noun
  1. A person who helps stop a disagreement or conflict and brings about peace.
    • In the schoolyard, she became a peacemaker when two friends started fighting.
    • The diplomat acted as a peacemaker between the two warring nations.
    • My grandmother was a peacemaker in our family, always helping us resolve arguments.