=Cosmetic changes.
Remove merge conflicts in README.md