Update README.md
fixing conflicts