diff --git a/crm/locale/main.pot b/crm/locale/main.pot
index e2b9566e..ae501663 100644
--- a/crm/locale/main.pot
+++ b/crm/locale/main.pot
@@ -7,13 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Frappe CRM VERSION\n"
 "Report-Msgid-Bugs-To: shariq@frappe.io\n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2025-08-17 09:36+0000\n"
 "PO-Revision-Date: 2025-08-17 09:36+0000\n"
-=======
-"POT-Creation-Date: 2025-08-10 09:37+0000\n"
-"PO-Revision-Date: 2025-08-10 09:37+0000\n"
->>>>>>> 00e3bd12 (chore: update POT file)
 "Last-Translator: shariq@frappe.io\n"
 "Language-Team: shariq@frappe.io\n"
 "MIME-Version: 1.0\n"