Update README.md

Testing how to deal with merge conflicts.