diff --git a/atroposlib/envs/server_handling/server_baseline.py b/atroposlib/envs/server_handling/server_baseline.py
index 276968ff..0e3aa950 100644
--- a/atroposlib/envs/server_handling/server_baseline.py
+++ b/atroposlib/envs/server_handling/server_baseline.py
@@ -310,7 +310,15 @@ class APIServer(ABC):
         if skip_reasoning:
             return kwargs
 
+<<<<<<< HEAD
         if self.reasoning_config is None or not self.reasoning_config.is_reasoning_kwargs_active():
+=======
+        # Check if reasoning is configured and active
+        if (
+            self.reasoning_config is None
+            or not self.reasoning_config.is_reasoning_kwargs_active()
+        ):
+>>>>>>> b6e24266b2c80442676b585dd3b58d34018c053f
             return kwargs
 
         # Get base_url to determine provider type