Finished cleaning conflicts

dungeonbattle/game.py

@@ -18,10 +18,10 @@ class Game:
     def new_game(self):
         # TODO generate a new map procedurally
         self.m = Map.load("example_map.txt")
-        self.d = MapDisplay(self.m)
         self.player = Player()
         self.player.y = 1
         self.player.x = 6
+        self.d = MapDisplay(self.m, self.player)
 
     @classmethod
     def load_game(filename):
@@ -32,7 +32,7 @@ class Game:
         while True:
             screen.clear()
             screen.refresh()
-            self.d.display(self.player.getPosY(), self.player.getPosX())
+            self.d.display(self.player.y, self.player.x)
             key = screen.getkey()
             self.handle_key_pressed(key)