diff --git a/python/hyperon/runner.py b/python/hyperon/runner.py
index 53a2c2122..548544a5a 100644
--- a/python/hyperon/runner.py
+++ b/python/hyperon/runner.py
@@ -212,7 +212,11 @@ def run_step_by_step(self, program, flat=False):
         yield state, results
         while not state.is_complete():
             state.run_step()
+<<<<<<< HEAD
             results = state.current_results(flat=flat)
+=======
+            results = state.current_results()
+>>>>>>> 96465f9 (add flat=False to process step by step)
             yield state, results
 
 
@@ -249,4 +253,4 @@ def custom_env(working_dir = None, config_dir = None, disable_config = False, is
             hp.env_builder_set_is_test(True)
         for path in reversed(include_paths):
             hp.env_builder_add_include_path(builder, path)
-        return builder
+        return builder
\ No newline at end of file