diff --git a/ihatemoney/translations/cs/LC_MESSAGES/messages.po b/ihatemoney/translations/cs/LC_MESSAGES/messages.po
index d39a5bd7..ebc288dc 100644
--- a/ihatemoney/translations/cs/LC_MESSAGES/messages.po
+++ b/ihatemoney/translations/cs/LC_MESSAGES/messages.po
@@ -3,11 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2021-11-01 18:01+0100\n"
-=======
-"POT-Creation-Date: 2021-10-26 23:38+0200\n"
->>>>>>> master
 "PO-Revision-Date: 2021-09-05 13:34+0000\n"
 "Last-Translator: Clonewayx <fillip1@seznam.cz>\n"
 "Language: cs\n"
@@ -1037,4 +1033,3 @@ msgstr ""
 
 #~ msgid "Participants to notify"
 #~ msgstr ""
-
diff --git a/ihatemoney/translations/fa/LC_MESSAGES/messages.po b/ihatemoney/translations/fa/LC_MESSAGES/messages.po
index f25b2a17..4f15d02a 100644
--- a/ihatemoney/translations/fa/LC_MESSAGES/messages.po
+++ b/ihatemoney/translations/fa/LC_MESSAGES/messages.po
@@ -3,11 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2021-11-01 18:01+0100\n"
-=======
-"POT-Creation-Date: 2021-10-26 23:38+0200\n"
->>>>>>> master
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language: fa\n"
@@ -946,4 +942,3 @@ msgstr ""
 
 #~ msgid "Participants to notify"
 #~ msgstr ""
-
diff --git a/ihatemoney/translations/kn/LC_MESSAGES/messages.po b/ihatemoney/translations/kn/LC_MESSAGES/messages.po
index 517912c5..f641fa06 100644
--- a/ihatemoney/translations/kn/LC_MESSAGES/messages.po
+++ b/ihatemoney/translations/kn/LC_MESSAGES/messages.po
@@ -3,11 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2021-11-01 18:01+0100\n"
-=======
-"POT-Creation-Date: 2021-10-26 23:38+0200\n"
->>>>>>> master
 "PO-Revision-Date: 2021-10-17 04:56+0000\n"
 "Last-Translator: a-g-rao <athrigrao@gmail.com>\n"
 "Language: kn\n"
@@ -947,4 +943,3 @@ msgstr ""
 
 #~ msgid "Participants to notify"
 #~ msgstr ""
-
diff --git a/ihatemoney/translations/ms/LC_MESSAGES/messages.po b/ihatemoney/translations/ms/LC_MESSAGES/messages.po
index 8d8748c1..7e4d0b2a 100644
--- a/ihatemoney/translations/ms/LC_MESSAGES/messages.po
+++ b/ihatemoney/translations/ms/LC_MESSAGES/messages.po
@@ -3,11 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2021-11-01 18:01+0100\n"
-=======
-"POT-Creation-Date: 2021-10-26 23:38+0200\n"
->>>>>>> master
 "PO-Revision-Date: 2021-07-18 12:32+0000\n"
 "Last-Translator: Kemystra <izzmin97@gmail.com>\n"
 "Language: ms\n"
@@ -957,4 +953,3 @@ msgstr ""
 
 #~ msgid "Participants to notify"
 #~ msgstr ""
-
diff --git a/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po b/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po
index b08e6176..cc4f62f2 100644
--- a/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po
+++ b/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po
@@ -3,11 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2021-11-01 18:01+0100\n"
-=======
-"POT-Creation-Date: 2021-10-26 23:38+0200\n"
->>>>>>> master
 "PO-Revision-Date: 2021-07-18 20:48+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language: nb_NO\n"
@@ -1229,4 +1225,3 @@ msgstr "Periode"
 
 #~ msgid "Participants to notify"
 #~ msgstr "legge til deltagere"
-
diff --git a/ihatemoney/translations/sr/LC_MESSAGES/messages.po b/ihatemoney/translations/sr/LC_MESSAGES/messages.po
index c5307723..49b8532a 100644
--- a/ihatemoney/translations/sr/LC_MESSAGES/messages.po
+++ b/ihatemoney/translations/sr/LC_MESSAGES/messages.po
@@ -3,11 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2021-11-01 18:01+0100\n"
-=======
-"POT-Creation-Date: 2021-10-26 23:38+0200\n"
->>>>>>> master
 "PO-Revision-Date: 2021-04-09 13:26+0000\n"
 "Last-Translator: Rastko Sarcevic <ralesarcevic@gmail.com>\n"
 "Language: sr\n"
@@ -1013,4 +1009,3 @@ msgstr "Period"
 
 #~ msgid "Participants to notify"
 #~ msgstr ""
-