deconfliction (conflict + de-; reversal_removal)
The act or process of deconflicting