Clarifications in README.md
merge conflicts resolved