update to package.json
fix conflict