diff --git a/lib/l10n/untranslated.json b/lib/l10n/untranslated.json
index b687347a0..f7eda209f 100644
--- a/lib/l10n/untranslated.json
+++ b/lib/l10n/untranslated.json
@@ -45,12 +45,9 @@
     "keyBindingHeader",
     "keyBindingPayload",
     "ebsiV4DecentralizedId",
-<<<<<<< HEAD
+    "noNotificationsYet",
     "approveProfileTitle",
     "approveProfileDescription"
-=======
-    "noNotificationsYet"
->>>>>>> main
   ],
 
   "es": [
@@ -99,12 +96,9 @@
     "keyBindingHeader",
     "keyBindingPayload",
     "ebsiV4DecentralizedId",
-<<<<<<< HEAD
+    "noNotificationsYet",
     "approveProfileTitle",
     "approveProfileDescription"
-=======
-    "noNotificationsYet"
->>>>>>> main
   ],
 
   "fr": [
@@ -158,11 +152,8 @@
     "keyBindingHeader",
     "keyBindingPayload",
     "ebsiV4DecentralizedId",
-<<<<<<< HEAD
+    "noNotificationsYet",
     "approveProfileTitle",
     "approveProfileDescription"
-=======
-    "noNotificationsYet"
->>>>>>> main
   ]
 }