diff --git a/third_party_mods/libjingle/source/talk/app/webrtc/webrtcsession.cc b/third_party_mods/libjingle/source/talk/app/webrtc/webrtcsession.cc
index 3325e5ba5..67d6dd097 100644
--- a/third_party_mods/libjingle/source/talk/app/webrtc/webrtcsession.cc
+++ b/third_party_mods/libjingle/source/talk/app/webrtc/webrtcsession.cc
@@ -523,21 +523,6 @@ bool WebRtcSession::OnRemoteDescription(
   return true;
 }
 
-<<<<<<< .mine
-=======
-void WebRtcSession::ProcessTerminateAccept(cricket::SessionDescription* desc) {
-  const cricket::ContentInfo* video_content = GetFirstVideoContent(desc);
-  if (video_content) {
-    SignalRemoveStream(video_content->name, true);
-  } else {
-    const cricket::ContentInfo* audio_content = GetFirstAudioContent(desc);
-    if (audio_content) {
-      SignalRemoveStream(audio_content->name, false);
-    }
-  }
-}
-
->>>>>>> .r402
 bool WebRtcSession::CheckForStreamDeleteMessage(
     const std::vector<cricket::Candidate>& candidates) {
   for (size_t i = 0; i < candidates.size(); ++i) {