Update README.md
Update README.md
fixing merge issues