diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot
index fcab9e69398..97c57d00bda 100644
--- a/addons/website/i18n/website.pot
+++ b/addons/website/i18n/website.pot
@@ -6,13 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~14.1\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2020-12-11 07:28+0000\n"
 "PO-Revision-Date: 2020-12-11 07:28+0000\n"
-=======
-"POT-Creation-Date: 2020-12-04 15:13+0000\n"
-"PO-Revision-Date: 2020-12-04 15:13+0000\n"
->>>>>>> 15beef60b52... temp
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"