Added a conflict line to README for working with Tom
Resolved merge conflict with Tom