diff --git a/docs/turn-loop.md b/docs/turn-loop.md
index 2d397dcd..7521589f 100644
--- a/docs/turn-loop.md
+++ b/docs/turn-loop.md
@@ -378,9 +378,11 @@ it as a stdio child via `--mcp-config`. The hyperhive socket name is
   the command runs asynchronously in a harness-managed tokio task. Stdout
   and stderr stream to `harness/bash-tasks/<id>.{out,err}`. When the
   task completes (or times out, or the process errors), the harness wakes
-  the agent with a summary body — handle on a future turn. Default
-  timeout 180s; pass `timeout_secs` to override. Requires the
-  `execution` tool group. Exposed as `mcp__bash__run`.
+<<<<<<< HEAD
+  the agent with a summary body — handle on a future turn. Optional
+  `timeout_secs`: pass a value for a deadline, or omit for no timeout
+  (runs until natural exit). Requires the `execution` tool group.
+  Exposed as `mcp__bash__run`.
 - `status(id)` — poll the status of a task submitted with
   `run`. Returns status (`pending`/`running`/`done`/`timed_out`/
   `interrupted`), exit code, run duration, and the last 4 KiB of stdout