fixing merge conflicts in package.json