diff --git a/dungeonbattle/interfaces.py b/dungeonbattle/interfaces.py
index 12cdaf7..934f290 100644
--- a/dungeonbattle/interfaces.py
+++ b/dungeonbattle/interfaces.py
@@ -37,11 +37,9 @@ class Map:
         width = len(lines[0])
         tiles = [[Tile(c)
                   for x, c in enumerate(line)] for y, line in enumerate(lines)]
-<<<<<<< HEAD
-        return Map(width, height, tiles)
-=======
+
         return Map(width, height, tiles, [])
->>>>>>> master
+
 
     def draw_string(self) -> str:
         """