diff --git a/.story_kit/work/4_merge/255_story_show_agent_logs_in_expanded_story_popup.md b/.story_kit/work/4_merge/255_story_show_agent_logs_in_expanded_story_popup.md
index 08aa547..29e8caf 100644
--- a/.story_kit/work/4_merge/255_story_show_agent_logs_in_expanded_story_popup.md
+++ b/.story_kit/work/4_merge/255_story_show_agent_logs_in_expanded_story_popup.md
@@ -1,5 +1,6 @@
 ---
 name: "Show agent logs in expanded story popup"
+merge_failure: "merge_agent_work tool returned empty output. The merge pipeline created the merge-queue branch (merge-queue/255_story_show_agent_logs_in_expanded_story_popup) and merge workspace worktree at .story_kit/merge_workspace, but hung without completing. This is the same issue that affected story 254 — likely related to bug 250 (merge pipeline cherry-pick fails with bad revision on merge-queue branch). The stale merge workspace worktree on the merge-queue branch may be blocking completion. Human intervention needed to: 1) clean up the merge workspace worktree and merge-queue branch, 2) investigate the root cause in the merge pipeline (possibly the cherry-pick/fast-forward step after squash merge), 3) retry the merge."
 ---
 
 # Story 255: Show agent logs in expanded story popup