chore: Resolve merge conflicts

internal/node-utils/src/index.ts

@@ -6,9 +6,12 @@ export { generatorContentHash } from './hash';
 export * from './monorepo';
 export { toPosixPath } from './path';
 export { prettierFormat } from './prettier';
+export * from './spinner';
 export type { Package } from '@manypkg/get-packages';
+export { default as colors } from 'chalk';
 export { consola } from 'consola';
+export * from 'execa';
+export { default as fs } from 'fs-extra';
 export { nanoid } from 'nanoid';
 export { type PackageJson, readPackageJSON } from 'pkg-types';
 export { rimraf } from 'rimraf';
-export { $, chalk as colors, fs, spinner } from 'zx';