Fixed conflict in .gitignore and README.md