unconflict

Verb

 * 1)  To eliminate or resolve a conflict in something.