Added a conflicting line