From 43893d1fd3c868f415011c0e71416985b36dcb69 Mon Sep 17 00:00:00 2001
From: Ethan <hensley.ethan64@gmail.com>
Date: Sun, 19 May 2024 18:02:37 -0400
Subject: [PATCH] Fix conflicts

---
 src/data/ability.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index 26734842283..6ac702e0e74 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -22,7 +22,7 @@ import i18next, { Localizable } from "#app/plugins/i18n.js";
 import { Command } from "../ui/command-ui-handler";
 import Battle from "#app/battle.js";
 import { ability } from "#app/locales/en/ability.js";
-import { Passive } from "#app/system/game-data.js";
+import { PokeballType, getPokeballName } from "./pokeball";
 
 export class Ability implements Localizable {
   public id: Abilities;