Updated package.json
Fixed an issue with the git url in package.json
Manual merge