Create README.md
conflict resolve