deleted git merge