Update README.md

Rich Bowen
fix merge conflicts