diff --git a/docs/gateway/remote.md b/docs/gateway/remote.md
index 800d9761e..aa3fff7f7 100644
--- a/docs/gateway/remote.md
+++ b/docs/gateway/remote.md
@@ -8,7 +8,7 @@ read_when:
 This repo supports “remote over SSH” by keeping a single Gateway (the master) running on a dedicated host (desktop/server) and connecting clients to it.
 
 - For **operators (you / the macOS app)**: SSH tunneling is the universal fallback.
-- For **nodes (iOS/Android and future devices)**: prefer the Gateway **Bridge** when on the same LAN/tailnet (see [Discovery](/gateway/discovery)).
+- For **nodes (iOS/Android and future devices)**: connect to the Gateway **WebSocket** (LAN/tailnet or SSH tunnel as needed).
 
 ## The core idea
 
@@ -55,12 +55,12 @@ One gateway service owns state + channels. Nodes are peripherals.
 Flow example (Telegram → node):
 - Telegram message arrives at the **Gateway**.
 - Gateway runs the **agent** and decides whether to call a node tool.
-- Gateway calls the **node** over the Bridge (`node.*` RPC).
+- Gateway calls the **node** over the Gateway WebSocket (`node.*` RPC).
 - Node returns the result; Gateway replies back out to Telegram.
 
 Notes:
 - **Nodes do not run the gateway service.** Only one gateway should run per host unless you intentionally run isolated profiles (see [Multiple gateways](/gateway/multiple-gateways)).
-- macOS app “node mode” is just a node client over the Bridge.
+- macOS app “node mode” is just a node client over the Gateway WebSocket.
 
 ## SSH tunnel (CLI + tools)
 
diff --git a/docs/gateway/tailscale.md b/docs/gateway/tailscale.md
index b7e657acc..b57ffcc33 100644
--- a/docs/gateway/tailscale.md
+++ b/docs/gateway/tailscale.md
@@ -95,8 +95,7 @@ clawdbot gateway --tailscale funnel --auth password
 - `gateway.bind: "tailnet"` is a direct Tailnet bind (no HTTPS, no Serve/Funnel).
 - `gateway.bind: "auto"` prefers loopback; use `tailnet` if you want Tailnet-only.
 - Serve/Funnel only expose the **Gateway control UI + WS**. Nodes connect over
-  the same Gateway WS endpoint, so Serve can work for node access. (Legacy TCP
-  bridge traffic is not proxied by Serve.)
+  the same Gateway WS endpoint, so Serve can work for node access.
 
 ## Browser control server (remote Gateway + local browser)
 
diff --git a/docs/nodes/index.md b/docs/nodes/index.md
index 0f3055567..3608ae382 100644
--- a/docs/nodes/index.md
+++ b/docs/nodes/index.md
@@ -297,23 +297,9 @@ Notes:
 - On macOS, the headless node host prefers the companion app exec host when reachable and falls
   back to local execution if the app is unavailable. Set `CLAWDBOT_NODE_EXEC_HOST=app` to require
   the app, or `CLAWDBOT_NODE_EXEC_FALLBACK=0` to disable fallback.
-<<<<<<< HEAD
 - Add `--tls` / `--tls-fingerprint` when the Gateway WS uses TLS.
-||||||| parent of 2ab821adc (docs: align node transport with gateway ws)
-- Add `--tls` / `--tls-fingerprint` when the bridge requires TLS.
-=======
-- Add `--tls` / `--tls-fingerprint` when the gateway requires TLS.
->>>>>>> 2ab821adc (docs: align node transport with gateway ws)
 
 ## Mac node mode
 
-<<<<<<< HEAD
 - The macOS menubar app connects to the Gateway WS server as a node (so `clawdbot nodes …` works against this Mac).
 - In remote mode, the app opens an SSH tunnel for the Gateway port and connects to `localhost`.
-||||||| parent of 2ab821adc (docs: align node transport with gateway ws)
-- The macOS menubar app connects to the Gateway bridge as a node (so `clawdbot nodes …` works against this Mac).
-- In remote mode, the app opens an SSH tunnel for the bridge port and connects to `localhost`.
-=======
-- The macOS menubar app connects to the Gateway WebSocket as a node (so `clawdbot nodes …` works against this Mac).
-- In remote mode, the app opens an SSH tunnel for the gateway port and connects to `localhost`.
->>>>>>> 2ab821adc (docs: align node transport with gateway ws)
diff --git a/docs/start/faq.md b/docs/start/faq.md
index d12859020..5fa24b5b8 100644
--- a/docs/start/faq.md
+++ b/docs/start/faq.md
@@ -728,7 +728,7 @@ Nodes don’t see inbound provider traffic; they only receive node RPC calls.
 ### How can my agent access my computer if the Gateway is hosted remotely?
 
 Short answer: **pair your computer as a node**. The Gateway runs elsewhere, but it can
-call `node.*` tools (screen, camera, system) on your local machine over the Bridge.
+call `node.*` tools (screen, camera, system) on your local machine over the Gateway WebSocket.
 
 Typical setup:
 1) Run the Gateway on the always‑on host (VPS/home server).