Check README.md
Manually resolved conflict