Fixed readme.md
Fixed merge issue