diff --git a/frigate/comms/dispatcher.py b/frigate/comms/dispatcher.py
index 8a30602d8..6a48c342e 100644
--- a/frigate/comms/dispatcher.py
+++ b/frigate/comms/dispatcher.py
@@ -180,17 +180,14 @@ class Dispatcher:
         record_settings = self.config.cameras[camera_name].record
 
         if payload == "ON":
-<<<<<<< Updated upstream
-            if not record_settings.enabled:
-=======
             if not self.config.cameras[camera_name].record.enabled_in_config:
                 logger.error(
                     f"Recordings are not enabled in the config, they can not be enabled after startup."
                 )
                 return
 
-            if not self.record_metrics[camera_name]["record_enabled"].value:
->>>>>>> Stashed changes
+
+            if not record_settings.enabled:
                 logger.info(f"Turning on recordings for {camera_name}")
                 record_settings.enabled = True
         elif payload == "OFF":
diff --git a/frigate/config.py b/frigate/config.py
index 88dcc1960..d62c6efda 100644
--- a/frigate/config.py
+++ b/frigate/config.py
@@ -955,21 +955,9 @@ class FrigateConfig(FrigateBaseModel):
             for input in camera_config.ffmpeg.inputs:
                 input.path = input.path.format(**FRIGATE_ENV_VARS)
 
-<<<<<<< Updated upstream
-=======
-            # ONVIF substitution
-            if camera_config.onvif.user or camera_config.onvif.password:
-                camera_config.onvif.user = camera_config.onvif.user.format(
-                    **FRIGATE_ENV_VARS
-                )
-                camera_config.onvif.password = camera_config.onvif.password.format(
-                    **FRIGATE_ENV_VARS
-                )
-
             # set config recording value
             camera_config.record.enabled_in_config = camera_config.record.enabled
 
->>>>>>> Stashed changes
             # Add default filters
             object_keys = camera_config.objects.track
             if camera_config.objects.filters is None: