Update package.json to fix merge conflict