took out the git merge tool crap