diff --git a/config/locales/en.yml b/config/locales/en.yml
index f7951b4de..2df8c8dc3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -976,11 +976,6 @@ en:
   applications:
     created: Application successfully created
     destroyed: Application successfully deleted
-<<<<<<< HEAD
-=======
-    invalid_regexp: "The provided Regexp is invalid: %{message}"
-    logout: Logout
->>>>>>> b663df641... Add reject pattern to Admin setting
     regenerate_token: Regenerate access token
     token_regenerated: Access token successfully regenerated
     warning: Be very careful with this data. Never share it with anyone!