Update the readme and package.json
Resolve conflict