diff --git a/survey_extra_fields/i18n/fr.po b/survey_extra_fields/i18n/fr.po
index b75bbb0..137c1ec 100644
--- a/survey_extra_fields/i18n/fr.po
+++ b/survey_extra_fields/i18n/fr.po
@@ -6,13 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2026-02-18 16:38+0000\n"
 "PO-Revision-Date: 2026-02-18 16:38+0000\n"
-=======
-"POT-Creation-Date: 2026-06-10 15:03+0000\n"
-"PO-Revision-Date: 2026-06-10 15:03+0000\n"
->>>>>>> d0afa23 ([IMP] survey_extra_fields : handle file question on page navigation)
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"