diff --git a/projects/mtg/src/DeckEditorMenu.cpp b/projects/mtg/src/DeckEditorMenu.cpp
index fe1f751c4..d229cc477 100644
--- a/projects/mtg/src/DeckEditorMenu.cpp
+++ b/projects/mtg/src/DeckEditorMenu.cpp
@@ -1,14 +1,13 @@
-<<<<<<< .mine
-#include "PrecompiledHeader.h"
-#include <iomanip>
-#include "DeckEditorMenu.h"
+#include "PrecompiledHeader.h"
+#include <iomanip>
+#include "DeckEditorMenu.h"
 #include "PrecompiledHeader.h"
 #include "DeckEditorMenu.h"
 #include "DeckDataWrapper.h"
-#include "DeckStats.h"
+#include "DeckStats.h"
 #include "JTypes.h"
-#include "GameApp.h"
-
+#include "GameApp.h"
+
 DeckEditorMenu::DeckEditorMenu(int id, JGuiListener* listener, int fontId, const char * _title, DeckDataWrapper *_selectedDeck, StatsWrapper *stats)
 : DeckMenu( id, listener, fontId, _title ), selectedDeck(_selectedDeck), stw( stats )
 {
@@ -50,18 +49,18 @@ void DeckEditorMenu::Render()
 
   DeckMenu::Render();
   WFont *mainFont = resources.GetWFont( Fonts::MAIN_FONT );
-  mainFont->DrawString( deckTitle.c_str(), statsX, statsY );
-
-  if ( stw && selectedDeck )
-    drawDeckStatistics();
-
-}
-
-void DeckEditorMenu::drawDeckStatistics()
-{
-  ostringstream deckStatsString;
-
-  deckStatsString
+  mainFont->DrawString( deckTitle.c_str(), statsX, statsY );
+
+  if ( stw && selectedDeck )
+    drawDeckStatistics();
+
+}
+
+void DeckEditorMenu::drawDeckStatistics()
+{
+  ostringstream deckStatsString;
+
+  deckStatsString
     << "------- Deck Summary -----" << endl
     << "Cards: "<< selectedDeck->getCount() << endl
     << "Creatures: "<< setw(2) << stw->countCreatures 
@@ -88,12 +87,12 @@ void DeckEditorMenu::drawDeckStatistics()
     << "Creature: "<< setprecision(2) << stw->avgCreatureCost << endl
     << "Mana: " << setprecision(2) << stw->avgManaCost << "   "
     << "Spell: " << setprecision(2) << stw->avgSpellCost << endl;
-
+
     WFont *mainFont = resources.GetWFont( Fonts::MAIN_FONT );
-    mainFont->DrawString( deckStatsString.str().c_str(), descX, descY + 25 );
-}
-
-DeckEditorMenu::~DeckEditorMenu()
-{
-  SAFE_DELETE( scroller );
-}
+    mainFont->DrawString( deckStatsString.str().c_str(), descX, descY + 25 );
+}
+
+DeckEditorMenu::~DeckEditorMenu()
+{
+  SAFE_DELETE( scroller );
+}
diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp
index 77ab566d8..2e6534e50 100644
--- a/projects/mtg/src/GameStateDeckViewer.cpp
+++ b/projects/mtg/src/GameStateDeckViewer.cpp
@@ -1414,7 +1414,7 @@ void GameStateDeckViewer::Render() {
 
 }
 
-
+
 int GameStateDeckViewer::loadDeck(int deckid){
 
   if (!stw)