Conciliator

A person who mediates a dispute. (source)