fix conflicts

Mage/src/test/java/mage/cards/decks/importer/MtgaImporterTest.java

@@ -0,0 +1,43 @@
+package mage.cards.decks.importer;
+
+import mage.cards.decks.DeckCardLists;
+import org.junit.Test;
+
+import java.io.File;
+
+import static org.junit.Assert.*;
+
+public class MtgaImporterTest {
+
+    private static final FakeCardLookup LOOKUP = new FakeCardLookup();
+
+    @Test
+    public void testImport() {
+        MtgaImporter importer = new MtgaImporter() {
+            @Override
+            public CardLookup getCardLookup() {
+                return LOOKUP;
+            }
+        };
+        StringBuilder errors = new StringBuilder();
+        DeckCardLists deck = importer.importDeck(
+                "src/test/java/mage/cards/decks/importer/samples/testdeck.mtga", errors);
+
+        TestDeckChecker.checker()
+                .addMain("Niv-Mizzet Reborn", 1)
+                .addMain("Teferi, Time Raveler", 1)
+                .addMain("Dovin's Veto", 1)
+                .addMain("Knight of Autumn", 1)
+                .addMain("Expansion // Explosion", 1)
+                .addMain("Forest", 1)
+                .addMain("Teferi, Hero of Dominaria", 1)
+
+                .addSide("Unmoored Ego", 1)
+                .addSide("Beacon Bolt", 1)
+
+                .verify(deck, 7, 2);
+
+        assertEquals("", errors.toString());
+    }
+
+}

Mage/src/test/java/mage/cards/decks/importer/samples/testdeck.mtga

@@ -0,0 +1,10 @@
+1 Niv-Mizzet Reborn (WAR) 208
+1 Teferi, Time Raveler (WAR) 221
+1 Dovin's Veto (WAR) 193
+1 Knight of Autumn (GRN) 183
+1 Expansion // Explosion (GRN) 224
+1 Forest (XLN) 277
+1 Teferi, Hero of Dominaria (DAR) 207
+
+1 Unmoored Ego (GRN) 212
+1 Beacon Bolt (GRN) 154