From 74f664ef96abdacf1ed1e96b65c1a58c444c2d6e Mon Sep 17 00:00:00 2001
From: Christopher Schmidt <schmidtc086@outlook.com>
Date: Tue, 15 Oct 2024 18:16:23 -0400
Subject: [PATCH] Merge and fix conflicts

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

diff --git a/src/data/move.ts b/src/data/move.ts
index f14f48819c1..de3825d0c90 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -6430,8 +6430,8 @@ export class TransformAttr extends MoveEffectAttr {
     user.summonData.gender = target.getGender();
     user.summonData.fusionGender = target.getFusionGender();
 
-      // Power Trick's effect will not preserved after using Transform
-      user.removeTag(BattlerTagType.POWER_TRICK);
+    // Power Trick's effect will not preserved after using Transform
+    user.removeTag(BattlerTagType.POWER_TRICK);
 
     // Copy all stats (except HP)
     for (const s of EFFECTIVE_STATS) {