update
fix conflict in package.json