Updated README
Resolved merge conflicts in README