diff --git a/cobalt/media/base/sbplayer_interface.h b/cobalt/media/base/sbplayer_interface.h
index 7d04f7b029d2..138e2870c8bf 100644
--- a/cobalt/media/base/sbplayer_interface.h
+++ b/cobalt/media/base/sbplayer_interface.h
@@ -92,12 +92,8 @@ class SbPlayerInterface {
     cval_stats_.Enable(should_enable);
   }
   CValStats cval_stats_;
-<<<<<<< HEAD
-=======
-  MediaMetricsProvider media_metrics_provider_;
 
   void SetDecodeToTexturePreferred(bool preferred);
->>>>>>> aada42d31c7 (Add decode to texture preferred option (#3011))
 };
 
 class DefaultSbPlayerInterface final : public SbPlayerInterface {