diff --git a/configure.ac b/configure.ac
index 47ca6adf45..bc5e7fa1ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,6 @@ AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
 dnl *** required versions of GStreamer stuff ***
-<<<<<<< HEAD
 GST_REQ=0.11.0
 GSTPB_REQ=0.11.0