fix web after merge

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>

pyproject.toml

@@ -134,7 +134,6 @@ django-model-utils = "*"
 django-prometheus = "*"
 django-redis = "*"
 django-storages = { extras = ["s3"], version = "*" }
-# See https://github.com/django-tenants/django-tenants/pull/959
 # See https://github.com/django-tenants/django-tenants/pull/997
 django-tenants = { git = "https://github.com/rissson/django-tenants.git", branch="authentik-fixes" }
 djangorestframework = "*"

web/src/user/user-settings/details/UserSettingsFlowExecutor.ts

@@ -38,12 +38,6 @@ export class UserSettingsFlowExecutor
     @property()
     flowSlug?: string;
 
-<<<<<<< HEAD
-    @state()
-    brand?: CurrentBrand;
-
-=======
->>>>>>> main
     private _challenge?: ChallengeTypes;
 
     @property({ attribute: false })