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

---
 config/conflict.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 config/conflict.txt

diff --git a/config/conflict.txt b/config/conflict.txt
new file mode 100644
index 0000000..180b47c
--- /dev/null
+++ b/config/conflict.txt
@@ -0,0 +1 @@
+baseline