diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2df8c8dc3..f7951b4de 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -976,6 +976,11 @@ 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!