diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
index 521400becce..059d6da4b76 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
@@ -54,10 +54,17 @@ namespace fastrtps {
 namespace rtps {
 
 // Default configuration values for EDP entities.
+<<<<<<< HEAD
 static const Duration_t edp_heartbeat_period{1, 0}; // 1 second
 static const Duration_t edp_nack_response_delay{0, 100 * 1000 }; // 100 milliseconds
 static const Duration_t edp_nack_supression_duration{0, 10 * 1000}; // 10 milliseconds
 static const Duration_t edp_heartbeat_response_delay{0, 10 * 1000}; // 10 milliseconds
+=======
+static const dds::Duration_t edp_heartbeat_period{1, 0}; // 1 second
+static const dds::Duration_t edp_nack_response_delay{0, 100 * 1000 * 1000 }; // 100 milliseconds
+static const dds::Duration_t edp_nack_supression_duration{0, 10 * 1000 * 1000}; // 10 milliseconds
+static const dds::Duration_t edp_heartbeat_response_delay{0, 10 * 1000 * 1000}; // 10 milliseconds
+>>>>>>> b53a3899 (Fix EDP reliability timings (#5540))
 
 static const int32_t edp_reader_initial_reserved_caches = 1;
 static const int32_t edp_writer_initial_reserved_caches = 20;
diff --git a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp
index 8e7c0018a22..543f1fba233 100644
--- a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp
@@ -765,7 +765,7 @@ TEST(DDSStatistics, correct_deletion_upon_delete_contained_entities)
                     writer->init();
                     ASSERT_TRUE(writer->isInitialized());
                     writer->wait_discovery();
-                    writer->send(*data, 10);
+                    writer->send(*data, 200);
                     writer->destroy();
                 }));