diff --git a/memory/2026-03-03-conflict-resolution-diagnostic.md b/memory/2026-03-03-conflict-resolution-diagnostic.md
new file mode 100644
index 000000000..68a4a0c09
--- /dev/null
+++ b/memory/2026-03-03-conflict-resolution-diagnostic.md
@@ -0,0 +1,16 @@
+# 2026-03-03 Session Notes
+
+## Conflict Resolution Diagnostic
+
+Brief session identifying merge conflicts in the Signet monorepo worktree. User asked about current conflicts on the main branch. Claude ran `git status` and found 4 files with UU status (both sides modified):
+
+- packages/daemon/src/daemon.ts (TypeScript)
+- packages/predictor/src/data.rs (Rust)
+- packages/predictor/src/main.rs (Rust)
+- packages/predictor/src/training.rs (Rust)
+
+User confirmed they wanted help resolving conflicts. Claude began examining conflict markers in daemon.ts but session ended before resolution was completed.
+
+A `marketing/` directory also exists untracked.
+
+No work was completed; this was purely diagnostic.
\ No newline at end of file