changed git merge tool back to emacs