removing conflicting lines