README.md

made a conflicting edit
Merged the errors