Finished cleaning conflicts

main.py

@@ -1,5 +1,10 @@
 #!/usr/bin/env python
 from dungeonbattle.game import Game
+from dungeonbattle.term_manager import TermManager
 
 if __name__ == "__main__":
-    Game().init()
+    with TermManager() as term_manager:
+        game = Game()
+        game.init()
+        game.new_game()
+        game.run(term_manager.screen)