Update README.md

Fixed merge conflict leftovers.