deconflict

Short definition from Wiktionary

Verb

1. 1
   To change the flight path of a craft or weapon to reduce the chance of an accidental collision or conflict with other obstacles, the terrain or weather.
2. 2
   To provide information to a military force in order to prevent escalation of a conflict.
3. 3
   To resolve contradictory conclusions or responses to queries in a rule-based or deductive reasoning system.
4. 4
   To alter (something) to avoid conflicting with something else.