Fix conflict in README.md

Clean up README to remove text from an uncaught merge conflict.