Update README.md
fixed conflict
conflict resolved