diff --git a/.tasks/STATUS.md b/.tasks/STATUS.md
index 77091e0..f5e822c 100644
--- a/.tasks/STATUS.md
+++ b/.tasks/STATUS.md
@@ -98,9 +98,18 @@ fatal: Not possible to fast-forward, aborting.
 
 ---
 
-## 🔴 [skills-grouping-revisit] — revisit flat vs grouped skills/ layout if count grows past ~30
-**Status:** active
-**Where I stopped:** (not started) — current 14 skills fit fine in flat `skills/`; threshold for revisiting is ~30
+## 🔵 [skills-grouping-revisit] — revisit flat vs grouped skills/ layout if count grows past ~30
+**Status:** blocked
+**Where I stopped:** workspace: pull --ff-only failed (diverged?): her:
+hint:
+hint: 	git merge --no-ff
+hint:
+hint: or:
+hint:
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config set advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
 **Next action:** when triggered (skill count crosses threshold), evaluate variant B (grouped by family) vs variant C (flat + manifest) from the original brainstorm in `.wiki/concepts/repo-layout.md`
 **Branch:** (not started)
 **Owner:** DESKTOP-NSEF0UK:claude-opus:35572