osnarayana's picture
Resolved merge conflict in README.md
8234bbd