deconflicting

verb
  1. resolving or eliminating conflicts, contradictions, or incompatibilities between systems, schedules, or parties
  2. Usage: present participle of deconflict; commonly used in military, aviation, and project management contexts

Examples