Added a conflicting line from git