Fixing README.md conflicts