validated the package.json
fixed merge errors