From a27cf20a6094ee3ccc356bf9f12d8f75cc37f31f Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Sun, 3 Dec 2023 21:45:06 -0500
Subject: [PATCH] merge fix

---
 Mage.Sets/src/mage/cards/h/HeatWave.java  | 6 ++----
 Mage.Sets/src/mage/cards/h/Hipparion.java | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/h/HeatWave.java b/Mage.Sets/src/mage/cards/h/HeatWave.java
index 75bdbb0443a..0c803d75be2 100644
--- a/Mage.Sets/src/mage/cards/h/HeatWave.java
+++ b/Mage.Sets/src/mage/cards/h/HeatWave.java
@@ -4,8 +4,6 @@ import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.common.PayLifeCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.ContinuousEffect;
-import mage.abilities.effects.ReplacementEffect;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.effects.RestrictionEffect;
 import mage.abilities.keyword.CumulativeUpkeepAbility;
@@ -63,7 +61,7 @@ class HeatWaveEffect1 extends RestrictionEffect {
     }
 
     @Override
-    public ContinuousEffect copy() {
+    public HeatWaveEffect1 copy() {
         return new HeatWaveEffect1(this);
     }
 
@@ -125,7 +123,7 @@ class HeatWaveEffect2 extends ReplacementEffectImpl {
     }
 
     @Override
-    public ReplacementEffect copy() {
+    public HeatWaveEffect2 copy() {
         return new HeatWaveEffect2(this);
     }
 }
diff --git a/Mage.Sets/src/mage/cards/h/Hipparion.java b/Mage.Sets/src/mage/cards/h/Hipparion.java
index f0aedbe626c..7282a980a40 100644
--- a/Mage.Sets/src/mage/cards/h/Hipparion.java
+++ b/Mage.Sets/src/mage/cards/h/Hipparion.java
@@ -5,7 +5,6 @@ import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.costs.mana.ManaCost;
-import mage.abilities.effects.ReplacementEffect;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -91,7 +90,7 @@ class HipparionEffect extends ReplacementEffectImpl {
     }
 
     @Override
-    public ReplacementEffect copy() {
+    public HipparionEffect copy() {
         return new HipparionEffect(this);
     }
 }