Initial commit
Update README.md
conflict fix in the README.md