some updates to README.md
fixed conflicts to README.md