diff --git a/Makefile b/Makefile
index a1e087771..4206104f6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 # This file is generated by tools/dmake, do not edit.
 
 ifndef CXXFLAGS
+<<<<<<< HEAD
     CXXFLAGS=-DHAVE_RULES -Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -g
+=======
+    CXXFLAGS=-DHAVE_DEPENDENCIES -Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -g
+>>>>>>> qwe
 endif
 
 ifndef CXX
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index b8b739ff1..3332f14c5 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -232,6 +232,7 @@ int main(int argc, char **argv)
         // TODO: add more compiler warnings.
         // -Wlogical-op      : doesn't work on older GCC
         // -Wconversion      : too many warnings
+        // -Wsign-conversion : too many warnings
 
         // The _GLIBCXX_DEBUG doesn't work in cygwin
         makeConditionalVariable(fout, "CXXFLAGS",
@@ -243,7 +244,7 @@ int main(int argc, char **argv)
                                 "-Wno-long-long "
                                 "-Wfloat-equal "
                                 "-Wcast-qual "
-                                "-Wsign-conversion "
+//                                "-Wsign-conversion "
 //                                "-Wconversion "
                                 "-g");
     }