Updated Readme and package.json
[Fix] Merge conflicts with README