remove git merge annotation