Update README.md

Fix merge issues in README.md