Update README.md
Resolves conflicts