From b679b6ecd02f616568403f6329ac1cbd7ece29ea Mon Sep 17 00:00:00 2001
From: Christopher Schmidt <schmidtc086@outlook.com>
Date: Sat, 8 Mar 2025 08:34:20 -0500
Subject: [PATCH] Fix merge conflict

---
 test/items/reviver_seed.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/items/reviver_seed.test.ts b/test/items/reviver_seed.test.ts
index 30138fea910..ab249d48a23 100644
--- a/test/items/reviver_seed.test.ts
+++ b/test/items/reviver_seed.test.ts
@@ -1,5 +1,5 @@
 import { BattlerIndex } from "#app/battle";
-import { allMoves } from "#app/data/move";
+import { allMoves } from "#app/data/moves/move";
 import { BattlerTagType } from "#app/enums/battler-tag-type";
 import type { PokemonInstantReviveModifier } from "#app/modifier/modifier";
 import { Abilities } from "#enums/abilities";