diff --git a/packages/insomnia-inso/src/cli.ts b/packages/insomnia-inso/src/cli.ts
index 3925991855..c115b2e686 100644
--- a/packages/insomnia-inso/src/cli.ts
+++ b/packages/insomnia-inso/src/cli.ts
@@ -38,6 +38,11 @@ import { matchIdIsh } from './db/models/util';
 import { loadWorkspace, promptWorkspace } from './db/models/workspace';
 import type { Database } from './db/types';
 import { InsoError } from './errors';
+<<<<<<< Updated upstream
+=======
+import { LogLevels } from 'consola';
+
+>>>>>>> Stashed changes
 import { BasicReporter, logger } from './logger';
 import { logTestResult, logTestResultSummary, reporterTypes, type TestReporter } from './reporter';
 import { generateDocumentation } from './scripts/docs';
diff --git a/packages/insomnia-inso/src/logger.ts b/packages/insomnia-inso/src/logger.ts
index d7e2bf14f9..7d6668c5c1 100644
--- a/packages/insomnia-inso/src/logger.ts
+++ b/packages/insomnia-inso/src/logger.ts
@@ -1,4 +1,8 @@
+<<<<<<< Updated upstream
 import type { ConsolaOptions, LogObject, LogType } from 'consola';
+=======
+import type { ConsolaOptions, LogObject, logType } from 'consola';
+>>>>>>> Stashed changes
 import { createConsola } from 'consola';
 
 type LogsByType = Partial<Record<LogType, string[]>>;
@@ -6,6 +10,10 @@ type LogsByType = Partial<Record<LogType, string[]>>;
 type ModifiedConsola = ReturnType<typeof createConsola> & { __getLogs: () => LogsByType };
 
 const consolaLogger = createConsola({
+<<<<<<< Updated upstream
+=======
+  fancy: true,
+>>>>>>> Stashed changes
   formatOptions: {
     date: false,
   },