Update package.json

fixing merge