unconflict

== English == === Etymology === From un- +‎ conflict. === Verb === unconflict (third-person singular simple present unconflicts, present participle unconflicting, simple past and past participle unconflicted) (transitive, rare, nonstandard) To eliminate or resolve a conflict in something.