fix merge conflicts

frigate/api/event.py

@@ -926,6 +926,12 @@ def set_description(
             ids=[id],
         )
 
+    response_message = (
+        f"Event {id} description is now blank"
+        if new_description is None or len(new_description) == 0
+        else f"Event {id} description set to {new_description}"
+    )
+
     return JSONResponse(
         content=(
             {

frigate/app.py

@@ -663,6 +663,7 @@ class FrigateApp:
                     self.onvif_controller,
                     self.external_event_processor,
                     self.stats_emitter,
+                    self.event_metadata_updater,
                 ),
                 host="127.0.0.1",
                 port=5001,