diff --git a/src/hotfix-conflict-29132659555-1.txt b/src/hotfix-conflict-29132659555-1.txt
index 1f5e3cab..786fe316 100644
--- a/src/hotfix-conflict-29132659555-1.txt
+++ b/src/hotfix-conflict-29132659555-1.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 recorded base side of the conflict
+=======
+trunk side of the conflict
+>>>>>>> debd3c9 (fix: trunk patch that conflicts on env/test)