resolutionary

Noun

 * 1)  A person who makes it their business to resolve disputes.