Add conflicting line