update package.json
fix merge conflicts