From 79196e5a7b7af3c31aff75cef2c09c3d986ee2a8 Mon Sep 17 00:00:00 2001
From: Temps Ray <temps.ray@gmail.com>
Date: Wed, 24 Apr 2024 23:10:20 -0400
Subject: [PATCH] more merge conflict stuff

---
 src/data/ability.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index 78b97c8b7ab..e129bf8ec2e 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -2832,10 +2832,11 @@ export function initAbilities() {
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.category === MoveCategory.PHYSICAL && (user.status?.effect === StatusEffect.POISON || user.status?.effect === StatusEffect.TOXIC), 1.5),
     new Ability(Abilities.FLARE_BOOST, 5)
       .attr(MovePowerBoostAbAttr, (user, target, move) => move.category === MoveCategory.SPECIAL && user.status?.effect === StatusEffect.BURN, 1.5),
-    new Ability(Abilities.HARVEST, 5),
+    new Ability(Abilities.HARVEST, 5)
+      .unimplemented(),
     new Ability(Abilities.TELEPATHY, 5)
-      .unimplemented()
-      .ignorable(),
+      .ignorable()
+      .unimplemented(),
     new Ability(Abilities.MOODY, 5)
       .attr(MoodyAbAttr),
     new Ability(Abilities.OVERCOAT, 5)