From 5ee25812ee827a5664d07d0e07507d1d2d2b5f12 Mon Sep 17 00:00:00 2001
From: codex-test <codex-test@example.invalid>
Date: Mon, 12 Oct 2026 15:23:45 +0000
Subject: [PATCH] chore: conflicting master fixture configuration

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

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