diff --git a/crm/locale/it.po b/crm/locale/it.po
index 5b0ccc6e..7df9b7df 100644
--- a/crm/locale/it.po
+++ b/crm/locale/it.po
@@ -3,19 +3,7 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: shariq@frappe.io\n"
 "POT-Creation-Date: 2025-08-03 09:38+0000\n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-"PO-Revision-Date: 2025-08-04 08:34\n"
-=======
-"PO-Revision-Date: 2025-08-09 10:05\n"
->>>>>>> 818fd6fc (chore: Italian translations)
-=======
-"PO-Revision-Date: 2025-08-10 10:38\n"
->>>>>>> cb3f67f2 (chore: Italian translations)
-=======
 "PO-Revision-Date: 2025-08-11 10:38\n"
->>>>>>> 2a7c9ef9 (chore: Italian translations)
 "Last-Translator: shariq@frappe.io\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -220,11 +208,7 @@ msgstr ""
 
 #: frontend/src/components/Settings/emailConfig.js:165
 msgid "Account name is required"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "Il nome dell'Account è obbligatorio"
->>>>>>> cb3f67f2 (chore: Italian translations)
 
 #: frontend/src/components/CustomActions.vue:73
 #: frontend/src/components/ViewControls.vue:683
@@ -1115,11 +1099,7 @@ msgstr ""
 
 #: frontend/src/components/Modals/ChangePasswordModal.vue:18
 msgid "Confirm Password"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "Ripeti Password"
->>>>>>> 818fd6fc (chore: Italian translations)
 
 #: frontend/src/components/Settings/Users.vue:225
 #: frontend/src/components/Settings/Users.vue:228
@@ -1687,11 +1667,7 @@ msgstr ""
 #: crm/fcrm/doctype/crm_global_settings/crm_global_settings.json
 #: crm/fcrm/doctype/crm_view_settings/crm_view_settings.json
 msgid "DocType"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "Tipo Documento"
->>>>>>> cb3f67f2 (chore: Italian translations)
 
 #. Label of the dt (Link) field in DocType 'CRM Fields Layout'
 #: crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.json
@@ -2123,11 +2099,7 @@ msgstr ""
 #: frontend/src/components/ViewControls.vue:203
 #: frontend/src/components/ViewControls.vue:251
 msgid "Export"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "Esporta"
->>>>>>> cb3f67f2 (chore: Italian translations)
 
 #: frontend/src/components/ViewControls.vue:282
 msgid "Export All {0} Record(s)"
@@ -2255,11 +2227,7 @@ msgstr ""
 #: frontend/src/components/SortBy.vue:6 frontend/src/components/SortBy.vue:106
 #: frontend/src/components/SortBy.vue:140
 msgid "First Name"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "Nome"
->>>>>>> cb3f67f2 (chore: Italian translations)
 
 #: frontend/src/components/Modals/LeadModal.vue:135
 msgid "First Name is mandatory"
@@ -2684,11 +2652,7 @@ msgstr ""
 #. Label of the is_default (Check) field in DocType 'CRM View Settings'
 #: crm/fcrm/doctype/crm_view_settings/crm_view_settings.json
 msgid "Is Default"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "È Predefinito"
->>>>>>> cb3f67f2 (chore: Italian translations)
 
 #. Label of the is_erpnext_in_different_site (Check) field in DocType 'ERPNext
 #. CRM Settings'