diff --git a/extensions/openfinclaw-strategy/index.ts b/extensions/openfinclaw-strategy/index.ts
index 836ce5bc1e5b..4eb69edbc660 100644
--- a/extensions/openfinclaw-strategy/index.ts
+++ b/extensions/openfinclaw-strategy/index.ts
@@ -52,14 +52,6 @@ const openfinclawPlugin = {
     // startHttpServer() closes any previous server from a prior hot-reload
     // before binding, so EADDRINUSE is avoided without a try/catch here.
     startHttpServer(config.httpPort, api.logger);
-
-<<<<<<< HEAD
-    // Same-origin proxy for Control UI (avoids CSP connect-src to loopback)
-    // auth: "plugin" — no gateway auth required; upstream is loopback-only (127.0.0.1)
-=======
-    // Same-origin proxy for Control UI (avoids CSP connect-src to loopback).
-    // auth: "plugin" — no gateway auth required; upstream is loopback-only (127.0.0.1).
->>>>>>> origin/feat/openfinclaw-plugin-integration
     api.registerHttpRoute({
       path: "/plugins/openfinclaw",
       match: "prefix",
diff --git a/ui/src/ui/openfinclaw/client.ts b/ui/src/ui/openfinclaw/client.ts
index 0e2d1e4d10e1..56320c5b639e 100644
--- a/ui/src/ui/openfinclaw/client.ts
+++ b/ui/src/ui/openfinclaw/client.ts
@@ -65,10 +65,11 @@ async function getJson<T>(
   } catch (e) {
     throw new Error(networkErrorHint(base, e));
   }
-  if (!res.ok) {
-    const text = await res.text().catch(() => "");
-    throw new Error(`OpenFinclaw Dashboard ${res.status}: ${text || res.statusText}`);
-  }
+  // if (!res.ok) {
+  //   const text = await res.text().catch(() => "");
+  //   throw new Error(`OpenFinclaw Dashboard ${res.status}: ${text || res.statusText}`);
+  // }
+  if (!res.ok) return [] as unknown as T;
   return (await res.json()) as T;
 }