From b877d71d54fab430cebaa7f4426820593f899bde Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 17 May 2026 20:54:17 +0000
Subject: [PATCH 1/2] chore(chaos): merge-conflict-artist base [test]

---
 scratchpad/chaos/mca-r21-base.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 scratchpad/chaos/mca-r21-base.md

diff --git a/scratchpad/chaos/mca-r21-base.md b/scratchpad/chaos/mca-r21-base.md
new file mode 100644
index 00000000000..273253df7b1
--- /dev/null
+++ b/scratchpad/chaos/mca-r21-base.md
@@ -0,0 +1,2 @@
+# Merge Conflict Artist (Run 21)
+Deliberate merge with history

From 0e5e8b8dea1d35c8af12f7f4974ad0ae4816a62d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 17 May 2026 20:54:19 +0000
Subject: [PATCH 2/2] chore(chaos): merge-conflict-artist follow-up [test]

---
 scratchpad/chaos/mca-r21-followup.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 scratchpad/chaos/mca-r21-followup.md

diff --git a/scratchpad/chaos/mca-r21-followup.md b/scratchpad/chaos/mca-r21-followup.md
new file mode 100644
index 00000000000..9d51541430a
--- /dev/null
+++ b/scratchpad/chaos/mca-r21-followup.md
@@ -0,0 +1,2 @@
+# Merge Conflict Artist Follow-up
+Resolved intentionally