diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 033b932b22..f1356a9c01 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -971,5 +971,4 @@
     "Failed to upload image": "Failed to upload image",
     "Failed to update group": "Failed to update group",
     "Hide avatars in user and room mentions": "Hide avatars in user and room mentions"
->>>>>>> 472b5b53502cfbb51be8218d09409c97e86bfcc7
 }