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