diff --git a/src/features/AuthStore/helpers.tsx b/src/features/AuthStore/helpers.tsx
index f16782bf..f9c02b3b 100644
--- a/src/features/AuthStore/helpers.tsx
+++ b/src/features/AuthStore/helpers.tsx
@@ -48,6 +48,8 @@ const redirectUrl = () => {
 // }
 
 
+=======
+>>>>>>> 4cdd32c (maybe fix redirect_uri for auth)
 export const getClientSettings = (): Settings => ({
   authority: AUTH_SERVICE,
   automaticSilentRenew: true,