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