Adding .gitignore file to ignore merge conflict files.