diff --git a/translate/translate.json b/translate/translate.json
index 30a5ff06..e94942cb 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -8023,7 +8023,6 @@
       "xloc": [
         "default-mobile.handlebars->9->127",
         "default.handlebars->29->1566"
->>>>>>> 127eca528440ad3fc332d1a1cc1579b8a9019434
       ]
     },
     {