diff --git a/src/hotfix-conflict-29132659555-1.txt b/src/hotfix-conflict-29132659555-1.txt
index 1f5e3cab..8b9eb2ba 100644
--- a/src/hotfix-conflict-29132659555-1.txt
+++ b/src/hotfix-conflict-29132659555-1.txt
@@ -1 +1 @@
-recorded base side of the conflict
+trunk drift ahead of the hotfix fix