resolved merge conflict on reademe.md