From d63a4b62ecc5e873775c07cd9423c3253262f095 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Fri, 7 Mar 2025 17:19:33 -0800
Subject: [PATCH] Resolve merge issue

---
 src/overrides.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/overrides.ts b/src/overrides.ts
index 97d16eebec9..dc04f72049a 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -15,18 +15,18 @@ import { Moves } from "#enums/moves";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { PokeballType } from "#enums/pokeball";
+import { PokemonType } from "#enums/pokemon-type";
 import { Species } from "#enums/species";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import { TimeOfDay } from "#enums/time-of-day";
-import { Type } from "#enums/type";
 import { VariantTier } from "#enums/variant-tier";
 import { WeatherType } from "#enums/weather-type";
 
 /**
  * This comment block exists to prevent IDEs from automatically removing unused imports
  * {@linkcode BerryType}, {@linkcode EvolutionItem}, {@linkcode FormChangeItem}
- * {@linkcode Stat}, {@linkcode Type}
+ * {@linkcode Stat}, {@linkcode PokemonType}
  */
 /**
  * Overrides that are using when testing different in game situations