fixing merge conflict issues in README.md