Update README.md
Another merge fix