Currently, combined updates #20 solve conflicts in package.json, but no package-lock.json. Solve this kind of conflicts