Removing git merge cruft line