Fix conflicts

Author: john-b-yang

codeclash/agents/__init__.py

@@ -11,8 +11,9 @@ def get_agent(config: dict, game: CodeGame) -> Player:
     }.get(config["agent"])
     if agents is None:
         raise ValueError(f"Unknown agent type: {config['agent']}")
-    environment = game.get_environment()
+    environment = game.get_environment(f"{game.game_id}_{config['name']}")
     template_vars = {
+        "game_name": game.name,
         "game_id": game.game_id,
         "rounds": game.rounds,
         "player_id": config["name"],

codeclash/agents/abstract.py

@@ -42,7 +42,7 @@ def push(self):
 
         for cmd in [
             f"git remote remove origin",
-            f"git remote add origin https://x-access-token:{token}@github.com/{GH_ORG}/{self.format_vars['game_name']}.git",
+            f"git remote add origin https://x-access-token:{token}@github.com/{GH_ORG}/{self.template_vars['game_name']}.git",
             f"git push origin {self.name}",
         ]:
             assert_zero_exit_code(self.environment.execute(cmd))