deleted conflicting