diff --git a/llama_toolchain/telemetry/api/api.py b/llama_toolchain/telemetry/api/api.py
index 2546c1ede..460c2fee2 100644
--- a/llama_toolchain/telemetry/api/api.py
+++ b/llama_toolchain/telemetry/api/api.py
@@ -125,7 +125,11 @@ Event = Annotated[
 
 class Telemetry(Protocol):
     @webmethod(route="/telemetry/log_event")
+<<<<<<< migrate_request_wrapper
     async def log_event(self, event: Event) -> None: ...
+=======
+    async def log_event(self, event: Event): ...
+>>>>>>> main
 
     @webmethod(route="/telemetry/get_trace", method="GET")
     async def get_trace(self, trace_id: str) -> Trace: ...