Update README.md
Fix merge conflicts with master