Fixed conflicts in README.md