diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 6693aa7167..f628cd2d93 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -1912,8 +1912,6 @@
     "showGroups": "Show Frames/Groups",
     "renderBypassState": "Render Bypass State",
     "renderErrorState": "Render Error State"
-<<<<<<< Updated upstream
-=======
   },
   "assetBrowser": {
     "assets": "Assets",
@@ -1942,6 +1940,5 @@
         "Close": "Close"
       }
     }
->>>>>>> Stashed changes
   }
-}
\ No newline at end of file
+}