From af77e2ef7f9bad6f3d8bc421356a56fc960dd51a Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sun, 13 Jul 2025 00:49:14 -0700
Subject: [PATCH] Fix merge issues and apply Biome

---
 test/abilities/status-immunity-ab-attrs.test.ts | 2 +-
 test/moves/rest.test.ts                         | 4 ++--
 test/moves/sleep_talk.test.ts                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/abilities/status-immunity-ab-attrs.test.ts b/test/abilities/status-immunity-ab-attrs.test.ts
index 7431c8cd8e3..62e516bde9e 100644
--- a/test/abilities/status-immunity-ab-attrs.test.ts
+++ b/test/abilities/status-immunity-ab-attrs.test.ts
@@ -6,7 +6,7 @@ import { MoveId } from "#enums/move-id";
 import { MoveResult } from "#enums/move-result";
 import { SpeciesId } from "#enums/species-id";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import { GameManager } from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/moves/rest.test.ts b/test/moves/rest.test.ts
index f24badb5995..ce2de7b8d4d 100644
--- a/test/moves/rest.test.ts
+++ b/test/moves/rest.test.ts
@@ -1,11 +1,11 @@
-import { MoveResult } from "#enums/move-result";
 import { AbilityId } from "#enums/ability-id";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { MoveId } from "#enums/move-id";
+import { MoveResult } from "#enums/move-result";
 import { SpeciesId } from "#enums/species-id";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
-import GameManager from "#test/testUtils/gameManager";
+import { GameManager } from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/moves/sleep_talk.test.ts b/test/moves/sleep_talk.test.ts
index 9a09891325a..fb7efb18958 100644
--- a/test/moves/sleep_talk.test.ts
+++ b/test/moves/sleep_talk.test.ts
@@ -1,13 +1,13 @@
 import { AbilityId } from "#enums/ability-id";
 import { MoveId } from "#enums/move-id";
 import { MoveResult } from "#enums/move-result";
+import { MoveUseMode } from "#enums/move-use-mode";
 import { SpeciesId } from "#enums/species-id";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import { GameManager } from "#test/testUtils/gameManager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { MoveUseMode } from "#enums/move-use-mode";
 
 describe("Moves - Sleep Talk", () => {
   let phaserGame: Phaser.Game;