diff --git a/.gitattributes b/.gitattributes
index 2766c920c12..72ba5243083 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -920,6 +920,7 @@ res/cardsfolder/compulsive_research.txt -text svneol=native#text/plain
 res/cardsfolder/concentrate.txt -text svneol=native#text/plain
 res/cardsfolder/concordant_crossroads.txt -text svneol=native#text/plain
 res/cardsfolder/condemn.txt -text svneol=native#text/plain
+res/cardsfolder/conflux.txt -text svneol=native#text/plain
 res/cardsfolder/confound.txt -text svneol=native#text/plain
 res/cardsfolder/congregate.txt -text svneol=native#text/plain
 res/cardsfolder/conquerors_pledge.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/conflux.txt b/res/cardsfolder/conflux.txt
new file mode 100644
index 00000000000..b3ddb94e51d
--- /dev/null
+++ b/res/cardsfolder/conflux.txt
@@ -0,0 +1,12 @@
+Name:Conflux
+ManaCost:3 W U B R G
+Types:Sorcery
+Text:no text
+A:SP$ChangeZone | Cost$ 3 W U B R G | Origin$ Library | Destination$ Hand | ChangeType$ Card.White | ChangeNum$ 1 |SubAbility$ SVar=DBBlue | SpellDescription$ Search your library for a white card, a blue card, a black card, a red card, and a green card. Reveal those cards and put them into your hand. Then shuffle your library.
+SVar:DBBlue:DB$ChangeZone | Cost$ 3 W U B R G | Origin$ Library | Destination$ Hand | ChangeType$ Card.Blue | ChangeNum$ 1 |SubAbility$ SVar=DBBlack 
+SVar:DBBlack:DB$ChangeZone | Cost$ 3 W U B R G | Origin$ Library | Destination$ Hand | ChangeType$ Card.Black | ChangeNum$ 1 |SubAbility$ SVar=DBRed 
+SVar:DBRed:DB$ChangeZone | Cost$ 3 W U B R G | Origin$ Library | Destination$ Hand | ChangeType$ Card.Red | ChangeNum$ 1 |SubAbility$ SVar=DBGreen 
+SVar:DBGreen:DB$ChangeZone | Cost$ 3 W U B R G | Origin$ Library | Destination$ Hand | ChangeType$ Card.Green | ChangeNum$ 1
+SVar:Rarity:Mythic
+SVar:Picture:http://www.wizards.com/global/images/magic/general/conflux.jpg
+End
\ No newline at end of file