removed git merge message