diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts
index f6ce4b3..ef14fdf 100644
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@@ -1607,7 +1607,6 @@
         <translation>Unterhaltungen mit ungelesenen Nachrichten hervorheben</translation>
     </message>
     <message>
-<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation>Inhalte in Hinweisen verbergen</translation>
     </message>
@@ -1619,11 +1618,6 @@
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
         <translation>Beim Tippen auf eine zitierte Nachricht zu dieser springen anstatt es in einem Overlay anzuzeigen.</translation>
     </message>
-=======
-        <source>Hide content in Notifications</source>
-        <translation>Inhalte in Hinweisen verbergen</translation>
-    </message>
->>>>>>> f771a9a (Some minor adjustments)
 </context>
 <context>
     <name>SettingsPage</name>
diff --git a/translations/harbour-fernschreiber-en.ts b/translations/harbour-fernschreiber-en.ts
index 39496c0..4f9f525 100644
--- a/translations/harbour-fernschreiber-en.ts
+++ b/translations/harbour-fernschreiber-en.ts
@@ -1609,7 +1609,6 @@ messages</numerusform>
         <translation type="unfinished"></translation>
     </message>
     <message>
-<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1619,9 +1618,6 @@ messages</numerusform>
     </message>
     <message>
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-=======
-        <source>Hide content in Notifications</source>
->>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber-fi.ts b/translations/harbour-fernschreiber-fi.ts
index 8dd5348..691fae8 100644
--- a/translations/harbour-fernschreiber-fi.ts
+++ b/translations/harbour-fernschreiber-fi.ts
@@ -1608,7 +1608,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1618,9 +1617,6 @@
     </message>
     <message>
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-=======
-        <source>Hide content in Notifications</source>
->>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts
index 3c5a445..60dbe5a 100644
--- a/translations/harbour-fernschreiber-hu.ts
+++ b/translations/harbour-fernschreiber-hu.ts
@@ -1579,7 +1579,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1589,9 +1588,6 @@
     </message>
     <message>
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-=======
-        <source>Hide content in Notifications</source>
->>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1701,7 +1697,6 @@
     </message>
     <message>
         <source>Active since: %1, last online: %2</source>
-<<<<<<< HEAD
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
@@ -1736,8 +1731,6 @@
     </message>
     <message>
         <source>Inactive sessions will be terminated after this timeframe</source>
-=======
->>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber-it.ts b/translations/harbour-fernschreiber-it.ts
index 8c62d93..67d1bdf 100644
--- a/translations/harbour-fernschreiber-it.ts
+++ b/translations/harbour-fernschreiber-it.ts
@@ -1607,7 +1607,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1617,9 +1616,6 @@
     </message>
     <message>
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-=======
-        <source>Hide content in Notifications</source>
->>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1729,7 +1725,6 @@
     </message>
     <message>
         <source>Active since: %1, last online: %2</source>
-<<<<<<< HEAD
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
@@ -1765,8 +1760,6 @@
     </message>
     <message>
         <source>Inactive sessions will be terminated after this timeframe</source>
-=======
->>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts
index 95f5ffb..261f37d 100644
--- a/translations/harbour-fernschreiber-pl.ts
+++ b/translations/harbour-fernschreiber-pl.ts
@@ -1635,7 +1635,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1645,9 +1644,6 @@
     </message>
     <message>
         <source>When tapping a quoted message, open it in chat instead of showing it in an overlay.</source>
-=======
-        <source>Hide content in Notifications</source>
->>>>>>> f771a9a (Some minor adjustments)
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber-sv.ts b/translations/harbour-fernschreiber-sv.ts
index 480a402..16953c3 100644
--- a/translations/harbour-fernschreiber-sv.ts
+++ b/translations/harbour-fernschreiber-sv.ts
@@ -1607,7 +1607,6 @@
         <translation>Färgmarkera konversationer med olästa meddelanden</translation>
     </message>
     <message>
-<<<<<<< HEAD
         <source>Hide content in notifications</source>
         <translation>Dölj innehåll i aviseringar</translation>
     </message>