Fixing package.json
Merge