diff --git a/res/cardsfolder/sheltered_valley.txt b/res/cardsfolder/sheltered_valley.txt
index d2d4b64952e..23ba5961de2 100644
--- a/res/cardsfolder/sheltered_valley.txt
+++ b/res/cardsfolder/sheltered_valley.txt
@@ -1,19 +1,9 @@
-<<<<<<< .mine
 Name:Sheltered Valley
 ManaCost:no cost
 Types:Land
 Text:If CARDNAME would enter the battlefield, instead sacrifice each other permanent named CARDNAME you control, then put CARDNAME onto the battlefield.\r\nAt the beginning of your upkeep, if you control three or fewer lands, you gain 1 life.
-A:AB$Mana | Cost$T | Produced$1 | SpellDescription$Add 1 to your mana pool.
+A:AB$Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 SVar:Rarity:Rare
 SVar:Picture:http://wizards.com/global/images/magic/general/sheltered_valley.jpg
-=======
-Name:Sheltered Valley
-ManaCost:no cost
-Types:Land
-Text:If CARDNAME would enter the battlefield, instead sacrifice each other permanent named CARDNAME you control, then put CARDNAME onto the battlefield.\r\nAt the beginning of your upkeep, if you control three or fewer lands, you gain 1 life.
-K:tap: add 1
-SVar:Rarity:Rare
-SVar:Picture:http://wizards.com/global/images/magic/general/sheltered_valley.jpg
 SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/187.jpg
->>>>>>> .r5145
 End
\ No newline at end of file