Fixed conflict in package.json