diff --git a/vision_agent/tools/tools.py b/vision_agent/tools/tools.py
index 4b1f27f0..0f16d3e9 100644
--- a/vision_agent/tools/tools.py
+++ b/vision_agent/tools/tools.py
@@ -19,11 +19,8 @@
     get_tool_descriptions_by_names,
     get_tool_documentation,
     get_tools_df,
-<<<<<<< HEAD
-    send_inference_request,
-=======
     get_tools_info,
->>>>>>> 58115951f8a050c9f9f7be2012efe97ec00498ed
+    send_inference_request,
 )
 from vision_agent.utils import extract_frames_from_video
 from vision_agent.utils.execute import FileSerializer, MimeType