diff --git a/configure b/configure
index 7fb7966..6e583f9 100755
--- a/configure
+++ b/configure
@@ -4027,18 +4027,11 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 # AC_CONFIG_HEADERS([config.h])
-<<<<<<< HEAD
-#AM_PATH_CHECK([0.9], [], [
-#         echo "Check is required for this program"
-#         exit -1])
-=======
 #the following line not always work
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
->>>>>>> dev
-
 # Checks for programs.
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'