Update README.md
Update README.md
Update LICENSE
Update package.json
Resolve conflicts