Update README.md
merging conflict correction
merge