Update README.md
resolve merge conflicts