Update README.md
updated readme
merged conflicts