diff --git a/.gitattributes b/.gitattributes
index 7f537840a90..cb5e340ee64 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4348,7 +4348,7 @@ res/cardsfolder/merchant_ship.txt -text svneol=native#text/plain
 res/cardsfolder/mercurial_kite.txt -text svneol=native#text/plain
 res/cardsfolder/merfolk_assassin.txt -text svneol=native#text/plain
 res/cardsfolder/merfolk_looter.txt -text svneol=native#text/plain
-res/cardsfolder/merfolk_observer.txt svneol=native#text/plain
+res/cardsfolder/merfolk_observer.txt -text svneol=native#text/plain
 res/cardsfolder/merfolk_of_the_pearl_trident.txt -text svneol=native#text/plain
 res/cardsfolder/merfolk_seastalkers.txt -text svneol=native#text/plain
 res/cardsfolder/merfolk_seer.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/makindi_shieldmate.txt b/res/cardsfolder/makindi_shieldmate.txt
index 0478756d72c..82cd9f352da 100644
--- a/res/cardsfolder/makindi_shieldmate.txt
+++ b/res/cardsfolder/makindi_shieldmate.txt
@@ -4,7 +4,8 @@ Types:Creature Kor Soldier Ally
 Text:no text
 PT:0/3
 K:Defender
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/res/cardsfolder/massacre_wurm.txt b/res/cardsfolder/massacre_wurm.txt
index a3b9af8cda9..753891aa2a3 100644
--- a/res/cardsfolder/massacre_wurm.txt
+++ b/res/cardsfolder/massacre_wurm.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B B
 Types:Creature Wurm
 Text:no text
 PT:6/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigMassacre | TriggerDescription$ When CARDNAME enters the battlefield, creatures your opponents control get -2/-2 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMassacre | TriggerDescription$ When CARDNAME enters the battlefield, creatures your opponents control get -2/-2 until end of turn.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature an opponent controls is put into a graveyard from the battlefield, that player loses 2 life.
 SVar:TrigMassacre:AB$PumpAll | Cost$ 0 | NumAtt$ -2 | NumDef$ -2 | ValidCards$ Creature.YouDontCtrl | IsCurse$ True
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | LifeAmount$ 2 | Defined$ Opponent
diff --git a/res/cardsfolder/merfolk_observer.txt b/res/cardsfolder/merfolk_observer.txt
index b0b682b1ed5..a00f1831cf3 100644
--- a/res/cardsfolder/merfolk_observer.txt
+++ b/res/cardsfolder/merfolk_observer.txt
@@ -1,12 +1,12 @@
-Name:Merfolk Observer
-ManaCost:1 U
-Types:Creature Merfolk Rogue
-Text:no text
-PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPeek | TriggerDescription$ When CARDNAME enters the battlefield, look at the top card of target player's library.
-SVar:TrigPeek:AB$ RearrangeTopOfLibrary | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Choose target player. | NumCards$ 1 | SpellDescription$ Look at the top card of target player's library.
-SVar:RemAI:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/merfolk_observer.jpg
-SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/76.jpg
+Name:Merfolk Observer
+ManaCost:1 U
+Types:Creature Merfolk Rogue
+Text:no text
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerDescription$ When CARDNAME enters the battlefield, look at the top card of target player's library.
+SVar:TrigPeek:AB$ RearrangeTopOfLibrary | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Choose target player. | NumCards$ 1 | SpellDescription$ Look at the top card of target player's library.
+SVar:RemAI:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/merfolk_observer.jpg
+SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/76.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/merrow_harbinger.txt b/res/cardsfolder/merrow_harbinger.txt
index 53f89499de2..23bfc93aa82 100644
--- a/res/cardsfolder/merrow_harbinger.txt
+++ b/res/cardsfolder/merrow_harbinger.txt
@@ -4,7 +4,7 @@ Types:Creature Merfolk Wizard
 Text:no text
 PT:2/3
 K:Islandwalk
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a Merfolk card, reveal it, then shuffle your library and put that card on top of it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a Merfolk card, reveal it, then shuffle your library and put that card on top of it.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Card.Merfolk | ChangeNum$ 1
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/murasa_pyromancer.txt b/res/cardsfolder/murasa_pyromancer.txt
index 526711d99f4..79c48b4ed1e 100644
--- a/res/cardsfolder/murasa_pyromancer.txt
+++ b/res/cardsfolder/murasa_pyromancer.txt
@@ -3,7 +3,8 @@ ManaCost:4 R R
 Types:Creature Human Shaman Ally
 Text:no text
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature equal to the number of Allies you control.
 SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ NumAllies
 SVar:NumAllies:Count$Valid Ally.YouCtrl
 SVar:PlayMain1:TRUE