Fixed some commit conflicts in README.md