actually solve merge conflicts

Signed-off-by: Santiago Figueroa Manrique <santiago.figueroa.manrique@alliander.com>

Author: figueroa1395

power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp

@@ -399,13 +399,14 @@ class MainModelImpl<ExtraRetrievableTypes<ExtraRetrievableType...>, ComponentLis
     SequenceIdx get_sequence_idx_map(ConstDataset const& update_data, Idx scenario_idx,
                                      ComponentFlags const& components_to_store) const {
         // TODO: (jguo) this function could be encapsulated in UpdateCompIndependence in update.hpp
-        return main_core::utils::run_functor_with_all_types_return_array(
+        return main_core::utils::run_functor_with_all_types_return_array<ComponentType...>(
             [this, scenario_idx, &update_data, &components_to_store]<typename CT>() {
                 if (!std::get<index_of_component<CT>>(components_to_store)) {
                     return std::vector<Idx2D>{};
                 }
-                auto const independence = check_components_independence<CT>(update_data);
-                validate_update_data_independence(independence);
+                auto const n_component = this->component_count<CT>();
+                auto const independence = main_core::check_component_independence<CT>(update_data, n_component);
+                main_core::validate_update_data_independence(independence);
                 return get_component_sequence<CT>(update_data, scenario_idx, independence);
             });
     }