diff --git a/src/hotfix-conflict-28203447808-1.txt b/src/hotfix-conflict-28203447808-1.txt
new file mode 100644
index 00000000..1ce13764
--- /dev/null
+++ b/src/hotfix-conflict-28203447808-1.txt
@@ -0,0 +1 @@
+trunk side of the conflict