Update README.md

remove merge conflict lines from README.md