diff --git a/src/management/checks/image-analysis-check.ts b/src/management/checks/image-analysis-check.ts
index e539bff4..39a0f7c5 100644
--- a/src/management/checks/image-analysis-check.ts
+++ b/src/management/checks/image-analysis-check.ts
@@ -94,8 +94,9 @@ export async function runImageAnalysisCheck(results: HealthCheck): Promise<void>
  * Fix image analysis configuration issues
  */
 export async function fixImageAnalysisConfig(): Promise<boolean> {
-  const { updateUnifiedConfig, loadOrCreateUnifiedConfig } =
-    await import('../../config/unified-config-loader');
+  const { updateUnifiedConfig, loadOrCreateUnifiedConfig } = await import(
+    '../../config/unified-config-loader'
+  );
 
   const config = loadOrCreateUnifiedConfig();
   let fixed = false;
diff --git a/tests/unit/cliproxy/provider-capabilities.test.ts b/tests/unit/cliproxy/provider-capabilities.test.ts
index c92c702f..13f3e8f7 100644
--- a/tests/unit/cliproxy/provider-capabilities.test.ts
+++ b/tests/unit/cliproxy/provider-capabilities.test.ts
@@ -32,6 +32,7 @@ describe('provider-capabilities', () => {
       'kiro',
       'ghcp',
       'claude',
+      'kimi',
     ]);
   });
 
@@ -43,7 +44,7 @@ describe('provider-capabilities', () => {
   });
 
   it('returns providers by OAuth flow capability', () => {
-    expect(getProvidersByOAuthFlow('device_code')).toEqual(['qwen', 'kiro', 'ghcp']);
+    expect(getProvidersByOAuthFlow('device_code')).toEqual(['qwen', 'kiro', 'ghcp', 'kimi']);
     expect(getProvidersByOAuthFlow('authorization_code')).toEqual([
       'gemini',
       'codex',
diff --git a/tests/unit/cursor/cursor-daemon.test.ts b/tests/unit/cursor/cursor-daemon.test.ts
index 34b1b1b9..1ba7e553 100644
--- a/tests/unit/cursor/cursor-daemon.test.ts
+++ b/tests/unit/cursor/cursor-daemon.test.ts
@@ -266,7 +266,6 @@ describe('startDaemon', () => {
       await stopDaemon();
     }
   });
->>>>>>> origin/dev
 });
 
 describe('isDaemonRunning', () => {