unconflict

/AH1 N K AH0 N F L IH1 K T/
verb
  1. 1

    (transitive, rare, nonstandard) To eliminate or resolve a conflict in something.