Resolve merge conflict for README.md