Remove git merge annotations