diff --git a/src/storm-dft-cli/storm-dyftee.cpp b/src/storm-dft-cli/storm-dyftee.cpp
index 71f5cea86..c0b0b58b2 100644
--- a/src/storm-dft-cli/storm-dyftee.cpp
+++ b/src/storm-dft-cli/storm-dyftee.cpp
@@ -6,6 +6,7 @@
 #include "storm/utility/macros.h"
 #include "storm/transformations/dft/DftToGspnTransformator.h"
 
+
 #include "storm/settings/modules/GeneralSettings.h"
 #include "storm/settings/modules/CoreSettings.h"
 #include "storm/settings/modules/DebugSettings.h"
@@ -17,6 +18,7 @@
 #include "storm-dft/parser/DFTGalileoParser.h"
 #include "storm-dft/modelchecker/dft/DFTModelChecker.h"
 #include "storm-dft/modelchecker/dft/DFTASFChecker.h"
+#include "storm-dft/transformations/dft/DftToGspnTransformator.h"
 
 #include "storm-dft/settings/modules/DFTSettings.h"
 
@@ -79,11 +81,8 @@ template <typename ValueType>
 storm::gspn::GSPN transformDFT(std::string filename) {
     storm::parser::DFTGalileoParser<ValueType> parser;
     storm::storage::DFT<ValueType> dft = parser.parseDFT(filename);
-<<<<<<< f8986fe6139bddaf5068477b0f70ac1f806f8576:src/storm-dft-cli/storm-dyftee.cpp
-=======
     storm::transformations::dft::DftToGspnTransformator<ValueType> gspnTransformator(dft);
     gspnTransformator.transform();
->>>>>>> updated dft->gspn translation to now have basis support for spares:src/storm/storm-dyftee.cpp
 }
 
 /*!
diff --git a/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp b/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp
index ae4144ee7..6c1834d78 100644
--- a/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp
+++ b/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp
@@ -1,12 +1,19 @@
 #include "DFTModelChecker.h"
 
 #include "storm/builder/ParallelCompositionBuilder.h"
+<<<<<<< 297f3ff48076dbf9b67056c82bc97409ef9fd445:src/storm-dft/modelchecker/dft/DFTModelChecker.cpp
+=======
+#include "storm/settings/modules/DFTSettings.h"
+>>>>>>> moving dfts to their own lib and cli:src/storm-dft/modelchecker/dft/DFTModelChecker.cpp
 #include "storm/utility/bitoperations.h"
 
 #include "storm-dft/builder/ExplicitDFTModelBuilder.h"
 #include "storm-dft/builder/ExplicitDFTModelBuilderApprox.h"
 #include "storm-dft/storage/dft/DFTIsomorphism.h"
+<<<<<<< 297f3ff48076dbf9b67056c82bc97409ef9fd445:src/storm-dft/modelchecker/dft/DFTModelChecker.cpp
 #include "storm-dft/settings/modules/DFTSettings.h"
+=======
+>>>>>>> moving dfts to their own lib and cli:src/storm-dft/modelchecker/dft/DFTModelChecker.cpp
 
 namespace storm {
     namespace modelchecker {