Added a line to readme.md
Fixed the merge conflicts in readme.md