Fixed merge conflict in README.md