diff --git a/include/engine/datafacade_factory.hpp b/include/engine/datafacade_factory.hpp
index 5b459f31c..e6c25fe05 100644
--- a/include/engine/datafacade_factory.hpp
+++ b/include/engine/datafacade_factory.hpp
@@ -71,6 +71,7 @@ template <template <typename A> class FacadeT, typename AlgorithmT> class DataFa
             std::size_t index =
                 std::stoi(exclude_prefix.substr(index_begin + 1, exclude_prefix.size()));
             BOOST_ASSERT(index >= 0 && index < facades.size());
+
             facades[index] =
                 std::make_shared<const Facade>(allocator, metric_name, index, timestamp);
         }
diff --git a/include/engine/routing_algorithms/routing_base.hpp b/include/engine/routing_algorithms/routing_base.hpp
index 516725dff..b8487bd91 100644
--- a/include/engine/routing_algorithms/routing_base.hpp
+++ b/include/engine/routing_algorithms/routing_base.hpp
@@ -177,11 +177,11 @@ void annotatePath(const FacadeT &facade,
         const auto geometry_index = facade.GetGeometryIndex(node_id);
         get_segment_geometry(geometry_index);
 
-
         BOOST_ASSERT(id_vector.size() > 0);
         BOOST_ASSERT(datasource_vector.size() > 0);
         BOOST_ASSERT(weight_vector.size() + 1 == id_vector.size());
         BOOST_ASSERT(duration_vector.size() + 1 == id_vector.size());
+
         const bool is_first_segment = unpacked_path.empty();
 
         const std::size_t start_index =
diff --git a/include/engine/unpacking_cache.hpp b/include/engine/unpacking_cache.hpp
index 459d23511..eb9de8ca9 100644
--- a/include/engine/unpacking_cache.hpp
+++ b/include/engine/unpacking_cache.hpp
@@ -2,7 +2,10 @@
 #define UNPACKING_CACHE_HPP
 
 #include <boost/optional/optional_io.hpp>
+<<<<<<< HEAD
 #include <boost/thread.hpp>
+=======
+>>>>>>> 68659b398... set up for computing durations while unpacking them
 
 #include "../../third_party/compute_detail/lru_cache.hpp"
 #include "util/typedefs.hpp"
diff --git a/unit_tests/mocks/mock_datafacade.hpp b/unit_tests/mocks/mock_datafacade.hpp
index 75a864fd8..916f634c0 100644
--- a/unit_tests/mocks/mock_datafacade.hpp
+++ b/unit_tests/mocks/mock_datafacade.hpp
@@ -73,7 +73,6 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
     {
         return WeightReverseRange(GetUncompressedForwardWeights(id));
     }
-
     DurationForwardRange GetUncompressedForwardDurations(const EdgeID /*id*/) const override
     {
         static std::uint64_t data[] = {1, 2, 3};