Deconflict changes