Fixes for M-02 to M-14, G-01 to G-14, K-02 to K-04, X-04 to X-14, not yet reviewed

Committed before review so Windows and WSL builds can start.
Each fix was tested and mutation-checked here; the codex review
of each item is still to come, so tasks/BUGS.md stays unticked.

M-02 is mid-review: round 1 findings are fixed (apps/ely-mark/src/tally.rs).
K-01 stays deferred. The ElyMark window test mark-outside.sh failed
once at its crash-recovery step in the last run; not yet looked into.

apps/ely-tree/src/conflict.rs

@@ -215,10 +215,12 @@ impl Tree {
         };
         let result = self.merge_editor.read(cx).text().to_string();
         let open = merging.takes.iter().filter(|taken| taken.is_none()).count();
+        if merging.takes.get(at).copied().flatten().is_some() {
+            let words = text(cx, "tree.conflict.taken", &[]);
+            return self.toast(words, Severity::Warning, cx);
+        }
         // Hand edits that moved the markers end block choices.
-        if merging.takes.get(at).copied().flatten().is_some()
-            || conflicts(&result, merging.size()).len() != open
-        {
+        if conflicts(&result, merging.size()).len() != open {
             let words = text(cx, "tree.conflict.hand", &[]);
             return self.toast(words, Severity::Warning, cx);
         }