diff --git a/CMakeLists.txt b/CMakeLists.txt
index 290840d42..191df10b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,7 +130,17 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vtkm/internal/Configure.h.in
 vtkm_install_headers(
   vtkm/internal ${CMAKE_CURRENT_BINARY_DIR}/vtkm/internal/Configure.h)
 
+<<<<<<< HEAD
 find_package(Pyexpander)
+=======
+
+# List of Boost features used:
+# * Smart Ptr
+# * Meta programming language
+find_package(BoostHeaders ${VTKm_REQUIRED_BOOST_VERSION} REQUIRED)
+
+#####find_package(Pyexpander)
+>>>>>>> f0c9879296bddaca59d42aaeb9d0ef7423f1457a
 
 #-----------------------------------------------------------------------------
 # Add subdirectories
diff --git a/vtkm/cont/CMakeLists.txt b/vtkm/cont/CMakeLists.txt
index effcfdde8..098b9982b 100644
--- a/vtkm/cont/CMakeLists.txt
+++ b/vtkm/cont/CMakeLists.txt
@@ -28,6 +28,7 @@ set(headers
   ArrayPortal.h
   ArrayPortalToIterators.h
   Assert.h
+  DataSet.h
   DeviceAdapter.h
   DeviceAdapterAlgorithm.h
   DeviceAdapterSerial.h