diff --git a/res/main.properties b/res/main.properties
index 538179c3bf9..0548eddd047 100644
--- a/res/main.properties
+++ b/res/main.properties
@@ -1,6 +1,6 @@
 program/mail=mtgerror@yahoo.com
 program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26
-program/version=Forge -- official beta: 10/01/17, SVN revision: 292
+program/version=Forge -- official beta: 10/01/17, SVN revision: 293
 
 tokens--file=AllTokens.txt
 
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index cacbf315986..e0188986ba1 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -16393,9 +16393,12 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase();
 
 		public void resolve()
         {
+			
+		  card.setKicked(true);
           PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController());
           for (int i = 0; i < 12; i++)
           {
+        	
             Card c = new Card();
 
             c.setOwner(card.getController());
@@ -16421,6 +16424,7 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase();
       kicker.setDescription("Kicker 6: If Conqueror's Pledge was kicked, put twelve of those tokens onto the battlefield instead.");
       kicker.setStackDescription(card.getName() + " - " + card.getController() + " puts twelve 1/1 white Kor Soldier creature tokens onto the battlefield.");
       
+      
       card.clearSpellAbility();
       card.addSpellAbility(spell);
       card.addSpellAbility(kicker);
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index c4263a9a14e..2f7d22a63a8 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -11057,7 +11057,7 @@ public class CardFactory_Creatures {
 	  				
 	  				hand.remove(card);
 	  				play.add(card);
-	  				card.comesIntoPlay(); //do i need this?
+	  				//card.comesIntoPlay(); //do i need this?
 	  			}
 	  			public boolean canPlay()
 	  			{
diff --git a/src/forge/InputControl.java b/src/forge/InputControl.java
index 0a77118cb1f..00cf665fde1 100644
--- a/src/forge/InputControl.java
+++ b/src/forge/InputControl.java
@@ -88,7 +88,7 @@ import java.util.*;
         	   {
         		   CardList list = new CardList();
         	   	   list.addAll(AllZone.Combat.getAttackers());
-        	   	   list.addAll(AllZone.pwCombat.getAttackers());
+        	   	   //list.addAll(AllZone.pwCombat.getAttackers());
         	   	   
 	        	   for (Card c : list)
 	     	   		   CombatUtil.checkPropagandaEffects(c);
@@ -297,7 +297,8 @@ import java.util.*;
            {
     		   CardList list = new CardList();
     	   	   list.addAll(AllZone.Combat.getAttackers());
-    	   	   list.addAll(AllZone.pwCombat.getAttackers());
+    	   	   //list.addAll(AllZone.pwCombat.getAttackers());
+    	   	   
 	    	   for (Card c : list)
 	 	   	   {
 	 	   		   CombatUtil.checkPropagandaEffects(c);