From 3bc3b42f47bb8d4b3bd0c41da6a0032528858334 Mon Sep 17 00:00:00 2001
From: Steve Phelps <phelps.sg@gmail.com>
Date: Thu, 9 Nov 2023 20:33:42 +0000
Subject: [PATCH] resolve merge conflict

---
 llm_cooperation/gametypes/repeated.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llm_cooperation/gametypes/repeated.py b/llm_cooperation/gametypes/repeated.py
index 1f4bfc6..427ac91 100644
--- a/llm_cooperation/gametypes/repeated.py
+++ b/llm_cooperation/gametypes/repeated.py
@@ -228,7 +228,7 @@ def generate_samples(
                 game_setup.payoffs,
                 game_setup.extract_choice,
                 measurement_setup.compute_freq,
-                game_setup.rounds,
+                game_setup.analyse_rounds,
             )
         except ValueError as ex:
             logger.exception(ex)