diff --git a/docs/docs/configuration/camera_specific.md b/docs/docs/configuration/camera_specific.md
index 34ef13662..2b355d4ac 100644
--- a/docs/docs/configuration/camera_specific.md
+++ b/docs/docs/configuration/camera_specific.md
@@ -108,18 +108,10 @@ According to [this discussion](https://github.com/blakeblackshear/frigate/issues
 ```yaml
 go2rtc:
   streams:
-<<<<<<< Updated upstream
     your_reolink_camera: 
-      - http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=username&password=password
-      - "ffmpeg:your_reolink_camera#audio=opus"
-    your_reolink_camera_sub: 
-      - http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_ext.bcs&user=username&password=password
-=======
-    reolink: 
       - "ffmpeg:http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=username&password=password#video=copy#audio=copy#audio=opus"
-    reolink_sub: 
+    your_reolink_camera_sub: 
       - "ffmpeg:http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_ext.bcs&user=username&password=password"
->>>>>>> Stashed changes
 
 cameras:
   reolink: