Update README
TC - fixed merge conflicts in the README.