This line is left here from a conflicting diff merge - before adding the conflicting files to the merge commit it's best to review the files and remove any of these lines.