diff --git a/configure b/configure
index 627a9ca7..d6c9fffe 100755
--- a/configure
+++ b/configure
@@ -156,14 +156,9 @@ bats = Info(
 
 d_info = dict()
 
-<<<<<<< HEAD
-for m in ["ocaml", "m4", "curl", "zlib", "path", "irpf90", "docopt",
-          "resultsFile", "ninja", "emsl", "ezfio", "p_graphviz",'bats']:
-=======
 for m in ["ocaml", "m4", "curl", "zlib", "patch", "irpf90", "docopt",
           "resultsFile", "ninja", "emsl", "ezfio", "p_graphviz",
           "zeromq", "f77zmq" ]:
->>>>>>> LCPQ-master
     exec ("d_info['{0}']={0}".format(m))