diff --git a/pack6_promo_base1.json b/pack6_promo_base1.json
index b7dc960..6165ffd 100644
--- a/pack6_promo_base1.json
+++ b/pack6_promo_base1.json
@@ -89,7 +89,11 @@
                     "effect_type": "suicide",
                     "sub_effects": [
                         {
+<<<<<<< HEAD
                             "effect": "damage_player_champions",
+=======
+                            "effect": "damage_all_champions",
+>>>>>>> cc48d11ea159396c60cca27a91e8c1c85db2319e
                             "amount": 4
                         }
                     ]
diff --git a/pack6_promo_base2.json b/pack6_promo_base2.json
index f7e960d..76f1fff 100644
--- a/pack6_promo_base2.json
+++ b/pack6_promo_base2.json
@@ -163,8 +163,8 @@
                 {
                     "effect": "gold",
                     "amount": 3,
-                    "effect_type": "faction_combo",
-                    "effect_type": "stunned_champion"
+                    "effect_type": "faction_and_stunned",
+                    "nik": "stunned_champion"
                 }
             ]
         },