Resolve merge conflicts in package-lock.json

Resolve Git merge conflicts for package-lock.json by generating a new one after solving the conflicts in the package.json

$ npm install --package-lock-only