Fix merge conflicts.

algo/detectors/sts/ReadoutConfig.h

@@ -50,7 +50,7 @@ namespace cbm::algo::sts
       size_t FEBsPerCrob() const { return feb2module.at(0).size(); }
 
       CBM_YAML_PROPERTIES(
-        config::Property(&Component::equipmentId, "equipmentId",
+        yaml::Property(&Component::equipmentId, "equipmentId",
                          "Equipment ID of component. Written to the data stream (MicrosliceDescriptor).", YAML::Hex),
         yaml::Property(&Component::feb2module, "feb2module",
                          "Mapping of FEB within CROB to module index (-1 = inactive)"),
@@ -78,21 +78,13 @@ namespace cbm::algo::sts
 
     const std::vector<Elink>& GetElinks(FEBType type) const;
 
-<<<<<<< HEAD
     CBM_YAML_PROPERTIES(yaml::Property(&ReadoutSetup::numAsicsPerFeb, "numAsicsPerFeb", "Number of ASICs per FEB"),
                       yaml::Property(&ReadoutSetup::modules, "modules", "Modules", {}, YAML::Flow),
                       yaml::Property(&ReadoutSetup::components, "components", "Components", {}, YAML::Flow),
-                      yaml::Property(&ReadoutSetup::elinks, "elinks", "Elinks", {}, YAML::Flow));
-=======
-    static constexpr auto Properties =
-      std::make_tuple(config::Property(&ReadoutSetup::numAsicsPerFeb, "numAsicsPerFeb", "Number of ASICs per FEB"),
-                      config::Property(&ReadoutSetup::modules, "modules", "Modules", {}, YAML::Flow),
-                      config::Property(&ReadoutSetup::components, "components", "Components", {}, YAML::Flow),
-                      config::Property(&ReadoutSetup::elinksFeb8_1, "elinksFeb8_1",
+                      yaml::Property(&ReadoutSetup::elinksFeb8_1, "elinksFeb8_1",
                                        "Elinks for FEB8_1 (1:1 elink:ASIC, 5 FEB / ROB)", {}, YAML::Flow),
-                      config::Property(&ReadoutSetup::elinksFeb8_5, "elinksFeb8_5",
+                      yaml::Property(&ReadoutSetup::elinksFeb8_5, "elinksFeb8_5",
                                        "Elinks for FEB8_5 (5:1 elink:ASIC, 1 FEB / ROB)", {}, YAML::Flow));
->>>>>>> 60b91d0c6 (Add support for FEB8_5 type in STS readout config.)
   };
 
   /** @class ReadoutConfig