From 63210a42b0593a0dbf23503484caa57a468968a4 Mon Sep 17 00:00:00 2001
From: Alexei Svitkine <alexei.svitkine@gmail.com>
Date: Fri, 18 May 2018 10:58:02 -0400
Subject: [PATCH] fix merge

---
 forge-game/src/main/java/forge/game/spellability/Spell.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/spellability/Spell.java b/forge-game/src/main/java/forge/game/spellability/Spell.java
index 5da66b98f83..bf901763044 100644
--- a/forge-game/src/main/java/forge/game/spellability/Spell.java
+++ b/forge-game/src/main/java/forge/game/spellability/Spell.java
@@ -122,9 +122,8 @@ public abstract class Spell extends SpellAbility implements java.io.Serializable
             lkicheck = true;
         }
 
-        if (lkicheck) {
         if (!Spell.performanceMode && lkicheck) {
-			game.getTracker().freeze(); //prevent views flickering during while updating for state-based effects
+            game.getTracker().freeze(); //prevent views flickering during while updating for state-based effects
             game.getAction().checkStaticAbilities(false, Sets.newHashSet(card), new CardCollection(card));
         }