From c099c5c08b8cf9eb2035b26b8805689e82ce964b Mon Sep 17 00:00:00 2001
From: PrabbyDD <dhaliprabh@gmail.com>
Date: Thu, 24 Oct 2024 10:32:05 -0700
Subject: [PATCH] fixing a merge conflict

---
 src/phases/switch-summon-phase.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts
index 01f60fc7246..c7e7bbe011e 100644
--- a/src/phases/switch-summon-phase.ts
+++ b/src/phases/switch-summon-phase.ts
@@ -64,9 +64,8 @@ export class SwitchSummonPhase extends SummonPhase {
     }
 
     const pokemon = this.getPokemon();
-
+    (this.player ? this.scene.getEnemyField() : this.scene.getPlayerField()).forEach(enemyPokemon => enemyPokemon.removeTagsBySourceId(pokemon.id));
     if (this.switchType === SwitchType.SWITCH || this.switchType === SwitchType.INITIAL_SWITCH) {
-      (this.player ? this.scene.getEnemyField() : this.scene.getPlayerField()).forEach(enemyPokemon => enemyPokemon.removeTagsBySourceId(pokemon.id));
       const substitute = pokemon.getTag(SubstituteTag);
       if (substitute) {
         this.scene.tweens.add({