Two conflicts, both resolved to trunk, both proven content-free for the running
machine before the merge was committed:
- `agent/APPEND_SYSTEM.md` — the checkout's dirty copy and trunk differ in one line
only: #61's trim of the duplicated one-log reasoning, replaced by the owner pointer.
The doctrine text itself is byte-identical on both sides.
- `desk-1-home.kdl` — non-comment lines are byte-identical (`diff` on the stripped
file: no output), so the deployed modes are unchanged: `3440x1440@180.000` ×3 and
`1920x1080@60.001`. What changes is the comment: trunk's carries the measured mode
list (`3440x1440@239.998` exists), the reason 180 is deliberate, and the verbatim
mode-string law — the live copy still asserted "no 240 Hz mode exists", which the
panel contradicts. `niri validate` on the assembled config: valid.
Deployment state after this: the checkout is main, and `agent/memories/**` +
`agent/managed-skills/**` were committed by the heartbeat commit underneath. Refs #60#62
Frank
22d2f3bcd8