README
README.md conflict solved