diff --git a/configure.ac b/configure.ac
index fba4274b0..42c813fba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,6 @@ MYSQL_CFLAGS="-I${MYSQL_PREFIX}/include"
 AC_SUBST(MYSQL_LIBS)
 AC_SUBST(MYSQL_CFLAGS)
 LDFLAGS="$LDFLAGS ${MYSQL_LIBS}"
-<<<<<<< HEAD
 
 
 MARIADB_PREFIX=/usr
@@ -137,29 +136,6 @@ This tells configure where to place the polkit policy files.])
 )
 AC_SUBST(POLKIT_PREFIX)
 PKG_CHECK_MODULES(POLKIT, polkit-gobject-1)
-<<<<<<< HEAD
-=======
-
-
-MARIADB_PREFIX=/usr
-AC_ARG_WITH(mariadb,
-    [  --with-mariadb=<path>        prefix of MariaDB installation, default /usr],
-    [MYSQL_PREFIX=$with_mariadb],
-    AC_MSG_WARN([You can call configure with the --with-mariadb option.
-    This tells configure where to find the mariaDB C library and headers if configure cannot
-    locate them automatically.
-    e.g. --with-mariadb=/usr/local or --with-mariadb=/usr])
-)
-AC_SUBST(MARIADB_PREFIX)
-MARIADB_LIBS="-L${MARIADB_PREFIX}/${LIB_ARCH}/mariadb"
-MARIADB_CFLAGS="-I${MARIADB_PREFIX}/include"
-AC_SUBST(MARIADB_LIBS)
-AC_SUBST(MARIADB_CFLAGS)
-LDFLAGS="$LDFLAGS ${MARIADB_LIBS}"
-
->>>>>>> tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set
-=======
->>>>>>> full systemd support
 
 FFMPEG_PREFIX=/usr
 AC_ARG_WITH(ffmpeg,