diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0981087be..c30a82b12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,6 +245,7 @@ if (CUDD_LIBRARY_DIRS)
     link_directories(${CUDD_LIBRARY_DIRS})
 endif(CUDD_LIBRARY_DIRS)
 
+<<<<<<< HEAD
 if (LTL2DSTAR_INCLUDE_DIRS)
     include_directories(${LTL2DSTAR_INCLUDE_DIRS})
 endif(LTL2DSTAR_INCLUDE_DIRS)
@@ -252,6 +253,8 @@ if (LTL2DSTAR_LIBRARY_DIRS)
     link_directories(${LTL2DSTAR_LIBRARY_DIRS})
 endif(LTL2DSTAR_LIBRARY_DIRS)
 
+=======
+>>>>>>> refs/heads/master
 # Add the executables
 # Must be created *after* Boost was added because of LINK_DIRECTORIES
 add_executable(storm ${STORM_SOURCES} ${STORM_HEADERS})
@@ -364,6 +367,7 @@ if (CUDD_LIBRARY_DIRS)
 		target_link_libraries(storm-performance-tests "-lobj -lcudd -lmtr -lst -lutil -lepd")
 	endif ()
 endif(CUDD_LIBRARY_DIRS)
+<<<<<<< HEAD
 
 if (LTL2DSTAR_LIBRARY_DIRS)
   if (MSVC)
@@ -374,6 +378,8 @@ if (LTL2DSTAR_LIBRARY_DIRS)
       target_link_libraries(storm-performance-tests "-lltl2dstar")
   endif ()
 endif (LTL2DSTAR_LIBRARY_DIRS)
+=======
+>>>>>>> refs/heads/master
 
 if (THREADS_FOUND)
 	include_directories(${THREADS_INCLUDE_DIRS})
diff --git a/src/modelchecker/prctl/GmmxxMdpPrctlModelChecker.h b/src/modelchecker/prctl/GmmxxMdpPrctlModelChecker.h
index 8c3590180..bc846f15e 100644
--- a/src/modelchecker/prctl/GmmxxMdpPrctlModelChecker.h
+++ b/src/modelchecker/prctl/GmmxxMdpPrctlModelChecker.h
@@ -154,7 +154,7 @@ private:
 		if (converged) {
 			LOG4CPLUS_INFO(logger, "Iterative solver converged after " << iterations << " iterations.");
 		} else {
-			LOG4CPLUS_WARN(logger, "Iterative solver did not converge.");
+			LOG4CPLUS_WARN(logger, "Iterative solver did not converge after " << iterations << " iterations.");
 		}
 	}
 };
diff --git a/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp b/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
index 99495314e..e13458016 100644
--- a/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
+++ b/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
@@ -123,4 +123,4 @@ TEST(GmmxxDtmcPrctlModelCheckerTest, SynchronousLeader) {
 
 	delete rewardFormula;
 	delete result;
-}
+}
\ No newline at end of file
diff --git a/test/performance/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp b/test/performance/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp
index 367425a8b..b8cdb104b 100644
--- a/test/performance/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp
+++ b/test/performance/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp
@@ -243,4 +243,4 @@ TEST(GmmxxMdpPrctlModelCheckerTest, Consensus) {
 	delete rewardFormula;
 	delete result;
 
-}
+}
\ No newline at end of file
diff --git a/test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp b/test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
index e345e0578..4f2598d3c 100644
--- a/test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
+++ b/test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp
@@ -241,4 +241,4 @@ TEST(SparseMdpPrctlModelCheckerTest, Consensus) {
 	delete rewardFormula;
 	delete result;
 
-}
+}
\ No newline at end of file