fix conflict
fix package.json typo