package.json: Fix to resolve merge