Added a conflict line to README
Resolved merge conflict