Update README.md

conflicting changes?