Resolved merge conflicts with origin/master README.md