diff --git a/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py b/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py
index c7803363e34..698a40aedd3 100644
--- a/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py
+++ b/tests/unit/completion_extras/litellm_responses_transformation/test_completion_extras_litellm_responses_transformation_transformation.py
@@ -4354,7 +4354,6 @@ def test_map_optional_params_verbosity_merges_into_text():
     assert verbosity_only_request["text"] == {"verbosity": "low"}
 
 
-<<<<<<< HEAD
 @pytest.mark.parametrize(
     "tool_call_id,is_custom",
     [