diff --git a/frontend/src/locale/src/lang-list.json b/frontend/src/locale/src/lang-list.json
index 76f6617c..a37dedf1 100644
--- a/frontend/src/locale/src/lang-list.json
+++ b/frontend/src/locale/src/lang-list.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "locale-en-US": {
     "defaultMessage": "English"
   },