deconflict

verb
  1. to resolve or eliminate conflicts or contradictions between two or more things
  2. Usage: often used in military, aviation, and project management contexts; transitive verb

Examples