deleted conflicting changes