updated readme.md
fixed merge conflict in README file