Solve conflicts

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>

Author: cferreiragonz

include/fastdds/statistics/dds/domain/DomainParticipant.hpp

@@ -22,14 +22,7 @@
 
 #include <string>
 
-<<<<<<< HEAD
-=======
-#include <fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp>
-#include <fastdds/dds/builtin/topic/PublicationBuiltinTopicData.hpp>
-#include <fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.hpp>
-#include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/core/status/StatusMask.hpp>
->>>>>>> 25a43a7c3 (Add UBSan workflow and solve its errors (#6386))
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>

src/cpp/fastdds/domain/DomainParticipantFactory.cpp

@@ -40,15 +40,11 @@
 #include <utils/shared_memory/SharedMemWatchdog.hpp>
 #include <utils/SystemInfo.hpp>
 
-<<<<<<< HEAD
-using namespace eprosima::fastrtps::xmlparser;
-=======
 #ifdef FASTDDS_STATISTICS
 #include <fastdds/statistics/dds/domain/DomainParticipant.hpp>
 #endif // ifdef FASTDDS_STATISTICS
 
-using namespace eprosima::fastdds::xmlparser;
->>>>>>> 25a43a7c3 (Add UBSan workflow and solve its errors (#6386))
+using namespace eprosima::fastrtps::xmlparser;
 
 using eprosima::fastrtps::ParticipantAttributes;
 using eprosima::fastdds::dds::Log;
@@ -171,19 +167,12 @@ DomainParticipant* DomainParticipantFactory::create_participant(
     const DomainParticipantQos& pqos = (&qos == &PARTICIPANT_QOS_DEFAULT) ? default_participant_qos_ : qos;
 
 #ifndef FASTDDS_STATISTICS
-<<<<<<< HEAD
+    DomainParticipant* dom_part = new DomainParticipant(mask);
     DomainParticipantImpl* dom_part_impl = new DomainParticipantImpl(dom_part, did, pqos, listen);
 #else
+    eprosima::fastdds::statistics::dds::DomainParticipant* dom_part = new eprosima::fastdds::statistics::dds::DomainParticipant(mask);
     eprosima::fastdds::statistics::dds::DomainParticipantImpl* dom_part_impl =
             new eprosima::fastdds::statistics::dds::DomainParticipantImpl(dom_part, did, pqos, listen);
-=======
-    DomainParticipant* dom_part = new DomainParticipant(mask);
-    DomainParticipantImpl* dom_part_impl = new DomainParticipantImpl(dom_part, did, pqos, listener);
-#else
-    statistics::dds::DomainParticipant* dom_part = new statistics::dds::DomainParticipant(mask);
-    statistics::dds::DomainParticipantImpl* dom_part_impl =
-            new statistics::dds::DomainParticipantImpl(dom_part, did, pqos, listener);
->>>>>>> 25a43a7c3 (Add UBSan workflow and solve its errors (#6386))
 #endif // FASTDDS_STATISTICS
 
     if (fastrtps::rtps::GUID_t::unknown() != dom_part_impl->guid())

src/cpp/rtps/history/PoolConfig.h

@@ -19,16 +19,11 @@
 #ifndef RTPS_HISTORY_POOLCONFIG_H_
 #define RTPS_HISTORY_POOLCONFIG_H_
 
-<<<<<<< HEAD
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
-=======
 #include <cstdint>
 #include <limits>
 
-#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
-#include <fastdds/rtps/attributes/ResourceManagement.hpp>
->>>>>>> 25a43a7c3 (Add UBSan workflow and solve its errors (#6386))
+#include <fastdds/rtps/attributes/HistoryAttributes.h>
+#include <fastdds/rtps/resources/ResourceManagement.h>
 
 namespace eprosima {
 namespace fastrtps {

src/cpp/statistics/fastdds/domain/DomainParticipant.cpp

@@ -31,17 +31,13 @@ namespace fastdds {
 namespace statistics {
 namespace dds {
 
-<<<<<<< HEAD
-ReturnCode_t DomainParticipant::enable_statistics_datawriter(
-=======
 DomainParticipant::DomainParticipant(
         const eprosima::fastdds::dds::StatusMask& mask)
     : eprosima::fastdds::dds::DomainParticipant(mask)
 {
 }
 
-fastdds::dds::ReturnCode_t DomainParticipant::enable_statistics_datawriter(
->>>>>>> 25a43a7c3 (Add UBSan workflow and solve its errors (#6386))
+ReturnCode_t DomainParticipant::enable_statistics_datawriter(
         const std::string& topic_name,
         const eprosima::fastdds::dds::DataWriterQos& dwqos)
 {