feat(silo): fix merge errors

Author: anna-parker

src/silo/common/phylo_tree.h

@@ -6,6 +6,7 @@
 #include <nlohmann/json.hpp>
 
 #include "silo/common/tree_node_id.h"
+#include "silo/query_engine/batched_bitmap_reader.h"
 
 namespace silo::common {
 using silo::common::TreeNodeId;

src/silo/storage/column/string_column.cpp

@@ -42,7 +42,7 @@ void StringColumnPartition::insert(const std::string& value) {
    const String<STRING_SIZE> tmp(value, metadata->dictionary);
    values.push_back(tmp);
    if (metadata->phylo_tree.has_value()) {
-      metadata->phylo_tree->checkNodeExists(value);
+      metadata->phylo_tree->validateNodeExists(value);
       auto child_it = (metadata->phylo_tree->nodes).find(TreeNodeId{value});
       child_it->second->row_index = values.size() - 1;
    }