diff --git a/src/crewai/flow/flow.py b/src/crewai/flow/flow.py
index 8d49602a1..3d05319e6 100644
--- a/src/crewai/flow/flow.py
+++ b/src/crewai/flow/flow.py
@@ -1232,7 +1232,6 @@ class Flow(Generic[T], metaclass=FlowMeta):
         elif level == "warning":
             logger.warning(message)
 
-<<<<<<< HEAD
     def plot(self, filename: Optional[str] = "crewai_flow") -> None:
         """Plot the flow graph visualization.
         
@@ -1246,7 +1245,4 @@ class Flow(Generic[T], metaclass=FlowMeta):
                 flow_name=self.__class__.__name__,
             ),
         )
-        self._telemetry.flow_plotting_span(
-            self.__class__.__name__, list(self._methods.keys())
-        )
         plot_flow(self, filename)