diff --git a/tests/wdio/test/pageobjects/admin.page.ts b/tests/wdio/test/pageobjects/admin.page.ts
index d0441ea13..b7bca0f40 100644
--- a/tests/wdio/test/pageobjects/admin.page.ts
+++ b/tests/wdio/test/pageobjects/admin.page.ts
@@ -1,5 +1,5 @@
-import { browser } from "@wdio/globals";
 import Page from "../pageobjects/page.js";
+import { browser } from "@wdio/globals";
 
 const CLICK_TIME_DELAY = 250;
 
diff --git a/tests/wdio/test/specs/bad-logins.ts b/tests/wdio/test/specs/bad-logins.ts
index ca2547c49..5bfce3343 100644
--- a/tests/wdio/test/specs/bad-logins.ts
+++ b/tests/wdio/test/specs/bad-logins.ts
@@ -8,8 +8,8 @@ describe("Log into authentik", () => {
         await LoginPage.username(BAD_USERNAME);
         const failure = await LoginPage.authFailure;
         expect(failure).toHaveText("Failed to authenticate.");
-     });
- 
+    });
+
     it("should fail on a bad password", async () => {
         await LoginPage.open();
         await LoginPage.username(GOOD_USERNAME);
@@ -17,5 +17,5 @@ describe("Log into authentik", () => {
         await LoginPage.password(BAD_PASSWORD);
         const failure = await LoginPage.authFailure;
         expect(failure).toHaveText("Failed to authenticate.");
-     });
+    });
 });
diff --git a/tests/wdio/wdio.conf.ts b/tests/wdio/wdio.conf.ts
index 7a9f778d4..bc754c01c 100644
--- a/tests/wdio/wdio.conf.ts
+++ b/tests/wdio/wdio.conf.ts
@@ -157,6 +157,7 @@ export const config: Options.Testrunner = {
         ui: "bdd",
         timeout: 60000,
     },
+<<<<<<< HEAD
     //
     // =====
     // Hooks
@@ -303,4 +304,6 @@ export const config: Options.Testrunner = {
      */
     // onReload: function(oldSessionId, newSessionId) {
     // }
+=======
+>>>>>>> main
 };