diff --git a/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java b/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
index 2486f81c8a..bf4c2322db 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
@@ -33,11 +33,6 @@ import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Rarity;
-<<<<<<< HEAD
-import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect;
-import mage.cards.CardImpl;
-=======
->>>>>>> origin/master
 import mage.counters.CounterType;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.Predicates;
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Darkness.java b/Mage.Sets/src/mage/sets/timeshifted/Darkness.java
index 4fd5121abc..945668e01a 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Darkness.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Darkness.java
@@ -28,12 +28,7 @@
 package mage.sets.timeshifted;
 
 import java.util.UUID;
-<<<<<<< HEAD
 
-import mage.constants.CardType;
-import mage.constants.Rarity;
-=======
->>>>>>> origin/master
 import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;