diff --git a/Core/include/Acts/Fitter/KalmanFitter.hpp b/Core/include/Acts/Fitter/KalmanFitter.hpp
index c0e51ca40d006ef9fd8e1487a3bf9449d4f7f90e..59ed4e52688bd8ce29faa6c368d23bcdf15b08f2 100644
--- a/Core/include/Acts/Fitter/KalmanFitter.hpp
+++ b/Core/include/Acts/Fitter/KalmanFitter.hpp
@@ -20,11 +20,8 @@
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Propagator/AbortList.hpp"
 #include "Acts/Propagator/ActionList.hpp"
-<<<<<<< HEAD
 #include "Acts/Propagator/ConstrainedStep.hpp"
-=======
 #include "Acts/Propagator/DirectNavigator.hpp"
->>>>>>> f176fbef... Adapt the KF fit to the DirectNavigator
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/detail/StandardAborters.hpp"
 #include "Acts/Utilities/CalibrationContext.hpp"
diff --git a/Core/include/Acts/Propagator/DirectNavigator.hpp b/Core/include/Acts/Propagator/DirectNavigator.hpp
index 673305a0c0426c80a87186071155fccaf4b5cccc..bcf26f9a82660ce748c97f05d8c22efe808320d7 100644
--- a/Core/include/Acts/Propagator/DirectNavigator.hpp
+++ b/Core/include/Acts/Propagator/DirectNavigator.hpp
@@ -134,34 +134,22 @@ class DirectNavigator {
       return dstream.str();
     });
     // Check if we are on surface
-<<<<<<< HEAD
     if (state.navigation.nextSurfaceIter !=
         state.navigation.surfaceSequence.end()) {
       // Establish the surface status
       auto surfaceStatus = stepper.updateSurfaceStatus(
           state.stepping, **state.navigation.nextSurfaceIter, false);
       if (surfaceStatus == Intersection::Status::onSurface) {
-=======
-    if (state.navigation.nextSurfaceIter != state.navigation.endSurfaceIter) {
-      if (stepper.surfaceReached(state.stepping,
-                                 *state.navigation.nextSurfaceIter)) {
->>>>>>> 695c717e... Fix the DirectNavigator
         // Set the current surface
         state.navigation.currentSurface = *state.navigation.nextSurfaceIter;
         debugLog(state, [&] {
           std::stringstream dstream;
-<<<<<<< HEAD
           dstream << "Current surface set to  "
                   << state.navigation.currentSurface->geoID();
-=======
-          dstream << "Current surface set to  ";
-          dstream << state.navigation.currentSurface->geoID();
->>>>>>> 695c717e... Fix the DirectNavigator
           return dstream.str();
         });
         // Move the sequence to the next surface
         ++state.navigation.nextSurfaceIter;
-<<<<<<< HEAD
         if (state.navigation.nextSurfaceIter !=
             state.navigation.surfaceSequence.end()) {
           debugLog(state, [&] {
@@ -179,14 +167,6 @@ class DirectNavigator {
                   << stepper.outputStepSize(state.stepping);
           return dstream.str();
         });
-=======
-      } else if ((*state.navigation.nextSurfaceIter)
-                     ->isOnSurface(state.geoContext,
-                                   stepper.position(state.stepping),
-                                   stepper.direction(state.stepping), false)) {
-        // Move the sequence to the next surface
-        ++state.navigation.nextSurfaceIter;
->>>>>>> 695c717e... Fix the DirectNavigator
       }
     }
   }