diff --git a/authentik/events/signals.py b/authentik/events/signals.py
index fec4a0cccef8..3f93e5deaa3e 100644
--- a/authentik/events/signals.py
+++ b/authentik/events/signals.py
@@ -76,7 +76,9 @@ def on_login_failed(
 ):
     """Failed Login, authentik custom event"""
     user = User.objects.filter(username=credentials.get("username")).first()
-    Event.new(EventAction.LOGIN_FAILED, **credentials, stage=stage, **kwargs).from_http(request, user)
+    Event.new(EventAction.LOGIN_FAILED, **credentials, stage=stage, **kwargs).from_http(
+        request, user
+    )
 
 
 @receiver(invitation_used)
diff --git a/website/package-lock.json b/website/package-lock.json
index a9a6f4d56be3..fda2df6ba237 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -16867,14 +16867,9 @@
             }
         },
         "node_modules/typescript": {
-<<<<<<< HEAD
-            "version": "5.4.5",
-            "license": "Apache-2.0",
-=======
             "version": "5.5.2",
             "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
             "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
->>>>>>> main
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"