diff --git a/ChangeLog b/ChangeLog
index 049af7b9e3..c571e6e2e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-07  Zeeshan Ali  <zeenix@gmail.com>
+
+	* configure.ac:
+	Fixed the build by fixing a small mistake of Wim.
+	
 2005-05-06  Wim Taymans  <wim@fluendo.com>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index e018feb766..5cb7b3db42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -361,7 +361,10 @@ dnl    ])
 dnl  ])
 dnl ])
 
-<<<<<<< configure.ac
+dnl ###########################
+dnl # Configure external libs #
+dnl ###########################
+
 dnl *** aalib ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_AALIB, true)
 GST_CHECK_FEATURE(AALIB, [aasink plug-in], aasink, [
@@ -369,14 +372,6 @@ GST_CHECK_FEATURE(AALIB, [aasink plug-in], aasink, [
   AS_SCRUB_INCLUDE(AALIB_CFLAGS)
 ])
 
-
-=======
-dnl ###########################
-dnl # Configure external libs #
-dnl ###########################
-
-
->>>>>>> 1.538
 dnl *** sidplay : works with libsidplay 1.36.x (not 2.x.x) ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true)
 GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [