diff --git a/src/backends/db2/soci-db2.h b/src/backends/db2/soci-db2.h
index 834626c32..0abb626a5 100644
--- a/src/backends/db2/soci-db2.h
+++ b/src/backends/db2/soci-db2.h
@@ -28,10 +28,13 @@
 
 #include <cstddef>
 #include <string>
+<<<<<<< HEAD
 #include <vector>
 #include <iostream>
 #include <sstream>
 #include <cstring>
+=======
+>>>>>>> Ignored ide files
 
 #include <sqlcli1.h>
 
diff --git a/src/backends/db2/test/test-db2.cpp b/src/backends/db2/test/test-db2.cpp
index a54914f6a..3d0a582f4 100644
--- a/src/backends/db2/test/test-db2.cpp
+++ b/src/backends/db2/test/test-db2.cpp
@@ -6,7 +6,11 @@
 //
 
 #include "soci.h"
+<<<<<<< HEAD
 #include "soci-db2.h"
+=======
+#include "soci-empty.h"
+>>>>>>> Ignored ide files
 #include <iostream>
 #include <string>
 #include <cassert>
@@ -16,7 +20,11 @@
 using namespace soci;
 
 std::string connectString;
+<<<<<<< HEAD
 backend_factory const &backEnd = *soci::factory_db2();
+=======
+backend_factory const &backEnd = *soci::factory_empty();
+>>>>>>> Ignored ide files
 
 
 // NOTE:
diff --git a/src/cmake/SociDependencies.cmake b/src/cmake/SociDependencies.cmake
index 3c12771a7..9850fb0ce 100644
--- a/src/cmake/SociDependencies.cmake
+++ b/src/cmake/SociDependencies.cmake
@@ -28,10 +28,6 @@ set(SOCI_BACKENDS_DB_DEPENDENCIES
   Firebird
   DB2)
 
-set(SOCI_BACKENDS_ALL_DEPENDENCIES
-  Boost
-  ${SOCI_BACKENDS_DB_DEPENDENCIES})
-
 #
 # Perform checks
 #