diff --git a/.gitattributes b/.gitattributes
index 36486889b8b..56d5ef65e7a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6942,6 +6942,7 @@ res/cardsfolder/p/prismatic_lens.txt svneol=native#text/plain
 res/cardsfolder/p/prismatic_omen.txt svneol=native#text/plain
 res/cardsfolder/p/prismatic_strands.txt -text
 res/cardsfolder/p/prismatic_ward.txt -text
+res/cardsfolder/p/prismwake_merrow.txt -text
 res/cardsfolder/p/pristine_angel.txt svneol=native#text/plain
 res/cardsfolder/p/pristine_talisman.txt svneol=native#text/plain
 res/cardsfolder/p/private_research.txt -text svneol=unset#text/plain
diff --git a/res/cardsfolder/p/prismwake_merrow.txt b/res/cardsfolder/p/prismwake_merrow.txt
new file mode 100644
index 00000000000..e7624efe7af
--- /dev/null
+++ b/res/cardsfolder/p/prismwake_merrow.txt
@@ -0,0 +1,15 @@
+Name:Prismwake Merrow
+ManaCost:2 U
+Types:Creature Merfolk Wizard
+Text:no text
+PT:2/1
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self |  Execute$ TrigChooseColor | TriggerDescription$ When CARDNAME enters the battlefield, target permanent becomes the color or colors of your choice until end of turn.
+SVar:TrigChooseColor:AB$ ChooseColor | Cost$ 0 | Defined$ You | OrColors$ True | SubAbility$ Animate
+SVar:Animate:DB$ Animate | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Colors$ ChosenColor | OverwriteColors$ True
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/prismwake_merrow.jpg
+SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/46.jpg
+Oracle:Flash\nWhen Prismwake Merrow enters the battlefield, target permanent becomes the color or colors of your choice until end of turn.
+End
\ No newline at end of file