Update package.json. fix botched merge