updated readme.md
merge conflict fix