Update README.md

searching for conflict