diff --git a/frontend/src/features/terminals/TerminalView.tsx b/frontend/src/features/terminals/TerminalView.tsx
index 75b2eeb..6ef7b7f 100644
--- a/frontend/src/features/terminals/TerminalView.tsx
+++ b/frontend/src/features/terminals/TerminalView.tsx
@@ -39,7 +39,6 @@ import { FitAddon } from "@xterm/addon-fit";
 import "@xterm/xterm/css/xterm.css";
 
 import { useGateways } from "@/app/di";
-import type { ResolvedAgentSystemPermissions } from "@/domain";
 import type {
   OpenTerminalOptions,
   ReattachResult,
@@ -114,8 +113,6 @@ interface TerminalViewProps {
    * it never remounts/reopens the terminal.
    */
   refitSignal?: number;
-  /** Optional resolved system permissions for this agent/cell. */
-  systemPermissions?: ResolvedAgentSystemPermissions | null;
 }
 
 /**
@@ -147,7 +144,6 @@ export function TerminalView({
   portal,
   onReady,
   refitSignal,
-  systemPermissions,
 }: TerminalViewProps) {
   const { terminal } = useGateways();
   const containerRef = useRef<HTMLDivElement | null>(null);
@@ -432,15 +428,6 @@ export function TerminalView({
     refitRef.current?.();
   }, [refitSignal]);
 
-  const showNetworkBanner =
-    systemPermissions != null &&
-    (systemPermissions.runtimeLock.state === "locked" ||
-      systemPermissions.effective === "deny");
-  const networkReason =
-    systemPermissions?.runtimeLock.reason ??
-    systemPermissions?.control.reason ??
-    "Le réseau est interdit pour cette cellule.";
-
   return (
     <div
       data-testid="terminal-view"
@@ -453,35 +440,6 @@ export function TerminalView({
     >
       {/* xterm mounts into this inner node; the error banner is a sibling so
           React never fights xterm over the same subtree. */}
-<<<<<<< HEAD
-      <div ref={containerRef} style={{ width: "100%", height: "100%" }} />
-      {showNetworkBanner && (
-        <div
-          role="status"
-          data-testid="terminal-network-banner"
-          style={{
-            position: "absolute",
-            top: 8,
-            left: 8,
-            right: 8,
-            padding: "0.5rem 0.75rem",
-            border: "1px solid rgba(245, 158, 11, 0.45)",
-            borderRadius: 6,
-            background: "rgba(24, 24, 27, 0.94)",
-            color: "var(--color-warning, #f59e0b)",
-            fontSize: 12,
-            fontFamily:
-              'ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, monospace',
-            whiteSpace: "pre-wrap",
-            wordBreak: "break-word",
-            zIndex: 2,
-          }}
-        >
-          {systemPermissions.runtimeLock.state === "locked"
-            ? "Réseau verrouillé par le runtime."
-            : "Réseau interdit pour cet agent."}{" "}
-          {networkReason}
-=======
       <div
         ref={containerRef}
         data-testid="terminal-xterm-container"
@@ -512,7 +470,6 @@ export function TerminalView({
           }}
         >
           Préparation du terminal…
->>>>>>> main
         </div>
       )}
       {openError && (