This line is from the git merge conflict too.