Added vimdiff for git merge