fixed package.json conflicts