these type of lines indicate a git "merge conflict" and should be resolved