removed git merge annotations