fix(package.json): bad merge