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
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