resolved a conflict in package.json