deconflicted

verb
  1. resolved or eliminated conflicts or contradictions between; made compatible or non-overlapping
  2. Usage: past tense and past participle of deconflict; commonly used in military, aviation, and project management contexts

Examples