Update README.md
README merge problem