From 4004708f511b366636432595673ba0561999b482 Mon Sep 17 00:00:00 2001
From: codex-test <codex-test@example.invalid>
Date: Mon, 12 Oct 2026 15:27:13 +0000
Subject: [PATCH] chore: establish merge conflict baseline

---
 config/conflict.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/conflict.txt b/config/conflict.txt
index 8082e11..180b47c 100644
--- a/config/conflict.txt
+++ b/config/conflict.txt
@@ -1 +1 @@
-master selects fixture B
+baseline