From 283796370549261553292790f5ea56e79ab3e57c Mon Sep 17 00:00:00 2001
From: Miguel Company <miguelcompany@eprosima.com>
Date: Tue, 3 Sep 2024 12:59:44 +0200
Subject: [PATCH] Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
---
 .../rtps/builtin/discovery/participant/PDPSimple.cpp  |  6 +-----
 test/blackbox/common/BlackboxTestsSecurity.cpp        | 11 +----------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index a6354ca016c..1253152a2c1 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -681,11 +681,7 @@ void PDPSimple::match_pdp_remote_endpoints(
             writer->matched_reader_add(*temp_reader_data);
         }
 
-<<<<<<< HEAD
-        if (BEST_EFFORT_RELIABILITY_QOS == reliability_kind)
-=======
-        if (!writer_only && (dds::BEST_EFFORT_RELIABILITY_QOS == reliability_kind))
->>>>>>> 3ca60e061 (Hotfix: Secure simple participants with `initialpeers` over `TCP` match (#5071))
+        if (!writer_only && (BEST_EFFORT_RELIABILITY_QOS == reliability_kind))
         {
             endpoints->writer.writer_->unsent_changes_reset();
         }
diff --git a/test/blackbox/common/BlackboxTestsSecurity.cpp b/test/blackbox/common/BlackboxTestsSecurity.cpp
index 9b126b742d8..2357490ea80 100644
--- a/test/blackbox/common/BlackboxTestsSecurity.cpp
+++ b/test/blackbox/common/BlackboxTestsSecurity.cpp
@@ -21,16 +21,6 @@
 #include <fstream>
 #include <map>
 
-<<<<<<< HEAD
-=======
-#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
-#include <fastdds/dds/log/Log.hpp>
-#include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/common/EntityId_t.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
-#include <fastdds/utils/IPFinder.hpp>
->>>>>>> 3ca60e061 (Hotfix: Secure simple participants with `initialpeers` over `TCP` match (#5071))
 #include <gtest/gtest.h>
 
 #include "PubSubReader.hpp"
@@ -43,6 +33,7 @@
 #include <fastdds/rtps/common/EntityId_t.hpp>
 #include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
 #include <fastrtps/xmlparser/XMLProfileManager.h>
+#include <fastrtps/utils/IPFinder.h>
 
 #include <rtps/transport/test_UDPv4Transport.h>