diff --git a/crm/locale/main.pot b/crm/locale/main.pot
index e97cd21b..180ac6b9 100644
--- a/crm/locale/main.pot
+++ b/crm/locale/main.pot
@@ -1857,11 +1857,7 @@ msgstr ""
 msgid "Edit Grid Row Fields Layout"
 msgstr ""
 
-<<<<<<< HEAD
-#: frontend/src/components/Modals/NoteModal.vue:18
-=======
 #: frontend/src/components/Modals/NoteModal.vue:6
->>>>>>> bf63bd54 (chore: update POT file)
 msgid "Edit Note"
 msgstr ""