changed .gitignore to ignore a couple things including .orig files coming from mergetool