Update README.md
Update README.md
Update README.md
Update README.md
removed conflicts
fixed generator folder name