Removing conflicting line