diff --git a/README.md b/README.md
index 9b27831ba..8a32d78b9 100644
--- a/README.md
+++ b/README.md
@@ -83,13 +83,8 @@ Homebrew only installs various plugins if explicitly enabled, so some extra
 ```
 $ brew install gstreamer gst-plugins-base gst-plugins-good \
       gst-plugins-bad gst-plugins-ugly gst-libav gst-rtsp-server \
-<<<<<<< HEAD
       --with-orc --with-libogg --with-opus --with-pango --with-theora \
       --with-libvorbis --with-libvpx --enable-gtk3
-=======
-      --with-orc -with-libogg --with-opus --with-pango --with-theora \
-      --with-libvorbis --with-libvpx
->>>>>>> Add libvpx to brew install
 ```
 
 If you wish to install the gstreamer-player sub-crate, make sure the