added merge conflict files to .gitignore