adding a conflicting line