Changes to package.json and readme.md
Fixed conflicts