peacemaker

A person who helps people stop fighting and get along.