diff --git a/packages/backend/migration/1695440131671-short-name.js b/packages/backend/migration/1695440131671-short-name.js
index 2c37297fc109..62a991c1ed70 100644
--- a/packages/backend/migration/1695440131671-short-name.js
+++ b/packages/backend/migration/1695440131671-short-name.js
@@ -1,3 +1,5 @@
+// conflict
+
 export class ShortName1695440131671 {
     name = 'ShortName1695440131671'