fix: fix conflicts

internal/bootstrap/app_bootstrap.go

@@ -29,14 +29,9 @@ type BootstrapApp struct {
 		csrfCookieName         string
 		redirectCookieName     string
 		oauthSessionCookieName string
-<<<<<<< HEAD
-		users                  []config.User
-		oauthWhitelist         []string
-		oauthProviders         map[string]config.OAuthServiceConfig
-=======
 		localUsers             *[]model.LocalUser
 		oauthProviders         map[string]model.OAuthServiceConfig
->>>>>>> main
+		oauthWhitelist         []string
 		configuredProviders    []controller.Provider
 		oidcClients            []model.OIDCClientConfig
 	}

internal/bootstrap/service_bootstrap.go

@@ -89,13 +89,8 @@ func (app *BootstrapApp) initServices(queries *repository.Queries) (Services, er
 	services.oauthBrokerService = oauthBrokerService
 
 	authService := service.NewAuthService(service.AuthServiceConfig{
-<<<<<<< HEAD
-		Users:              app.context.users,
-		OauthWhitelist:     app.context.oauthWhitelist,
-=======
 		LocalUsers:         app.context.localUsers,
-		OauthWhitelist:     app.config.OAuth.Whitelist,
->>>>>>> main
+		OauthWhitelist:     app.context.oauthWhitelist,
 		SessionExpiry:      app.config.Auth.SessionExpiry,
 		SessionMaxLifetime: app.config.Auth.SessionMaxLifetime,
 		SecureCookie:       app.config.Auth.SecureCookie,