added .orig (merge conflicts) to .gitignore