diff --git a/pb/src/client_container.proto b/pb/src/client_container.proto
index 7be007f4d..901797515 100644
--- a/pb/src/client_container.proto
+++ b/pb/src/client_container.proto
@@ -484,7 +484,6 @@ message RecordingMasterMixComplete {
     optional string notification_id = 4;
     optional string created_at = 5;
     optional string claimed_recording_id = 6;
-<<<<<<< HEAD
 }
 
 message RecordingStreamMixComplete {
@@ -494,8 +493,6 @@ message RecordingStreamMixComplete {
     optional string notification_id = 4;
     optional string created_at = 5;
     optional string claimed_recording_id = 6;
-=======
->>>>>>> feature/video_mvp
 }
 
 message DownloadAvailable {