Fix merge conflict in README.md