Fixed ".gitignore" and "README.md" merge conflicts