Fix merge conflict from Armar7

source/armarx/navigation/components/laser_scanner_feature_extraction/Component.cpp

@@ -44,14 +44,10 @@
 #include "RobotAPI/libraries/core/remoterobot/RemoteRobot.h"
 
 #include "armarx/navigation/components/laser_scanner_feature_extraction/geometry.h"
+#include "armarx/navigation/conversions/eigen.h"
 
 #include "ArVizDrawer.h"
 #include "FeatureExtractor.h"
-<<<<<<< HEAD
-#include "armarx/navigation/components/laser_scanner_feature_extraction/geometry.h"
-#include "armarx/navigation/conversions/eigen.h"
-=======
->>>>>>> b85a33d8912874d7fd4c7d409640f63a26291cbf
 #include "conversions/eigen.h"
 #include "conversions/pcl_eigen.h"
 
@@ -641,7 +637,6 @@ namespace armarx::navigation::components::laser_scanner_feature_extraction
         laserScannerFeatureWriter.store(armemFeatures, getName(), timestamp);
     }
 
-
     ARMARX_REGISTER_COMPONENT_EXECUTABLE(LaserScannerFeatureExtraction,
                                          LaserScannerFeatureExtraction::GetDefaultName());
 

source/armarx/navigation/memory/client/laser_scanner_features/Reader.cpp

@@ -50,9 +50,8 @@ namespace armarx::navigation::memory::client::laser_scanner_features
     {
         armarx::armem::client::query::Builder qb;
 
-<<<<<<< HEAD
         auto& sel = qb.coreSegments()
-                        .withName(properties.coreSegmentName)
+                        .withName(properties().coreSegmentName)
                         .providerSegments()
                         .withName(query.providerName);
 
@@ -65,26 +64,6 @@ namespace armarx::navigation::memory::client::laser_scanner_features
             }
             return sel.entities().withName(query.name);
         }();
-=======
-        qb.coreSegments()
-            .withName(properties().coreSegmentName)
-            .providerSegments()
-            .withName(query.providerName)
-            .entities()
-            .all()
-            .snapshots()
-            .beforeOrAtTime(query.timestamp);
-
-        // auto entitySel = [&]()
-        // {
-        //     if (query.name.empty())
-        //     {
-        //         ARMARX_INFO << "querying all entities";
-        //         return sel.entities().all();
-        //     }
-        //     return sel.entities().withName(query.name);
-        // }();
->>>>>>> b85a33d8912874d7fd4c7d409640f63a26291cbf
 
         entitySel.snapshots().beforeOrAtTime(query.timestamp);