deleted conflicts for package.json