deleted conflicting line