resolved conflicts in package.json