rm conflicts in package.json