Merge conflicts in README.md