diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp
index ca3a21f99..8e5d067c1 100644
--- a/code/DDSCodeTester.cpp
+++ b/code/DDSCodeTester.cpp
@@ -3938,6 +3938,7 @@ void dds_qos_examples()
 
     {
         //DDS_CHANGE_RESOURCE_LIMITS_QOS_POLICY
+<<<<<<< HEAD
         ResourceLimitsQosPolicy resource_limits;
         //The ResourceLimitsQosPolicy is default constructed with max_samples = 5000
         //Change max_samples to 200
@@ -3951,6 +3952,24 @@ void dds_qos_examples()
         //The ResourceLimitsQosPolicy is default constructed with allocated_samples = 100
         //Change allocated_samples to 50
         resource_limits.allocated_samples = 50;
+=======
+        // This example uses a DataWriter, but it can also be applied to DataReader and Topic entities
+        DataWriterQos writer_qos;
+        // The ResourceLimitsQosPolicy is constructed with max_samples = 5000 by default
+        // Change max_samples to 2000
+        writer_qos.resource_limits().max_samples = 2000;
+        // The ResourceLimitsQosPolicy is constructed with max_instances = 10 by default
+        // Change max_instances to 20
+        writer_qos.resource_limits().max_instances = 20;
+        // The ResourceLimitsQosPolicy is constructed with max_samples_per_instance = 400 by default
+        // Change max_samples_per_instance to 100
+        writer_qos.resource_limits().max_samples_per_instance = 100;
+        // The ResourceLimitsQosPolicy is constructed with allocated_samples = 100 by default
+        // Change allocated_samples to 50
+        writer_qos.resource_limits().allocated_samples = 50;
+        // Use modified QoS in the creation of the corresponding entity
+        writer_ = publisher_->create_datawriter(topic_, writer_qos);
+>>>>>>> d60571d (Adjust XML snippets to meet QoS constraints (#934))
         //!--
     }
 
diff --git a/code/XMLTester.xml b/code/XMLTester.xml
index 7d3707295..34aeff0b0 100644
--- a/code/XMLTester.xml
+++ b/code/XMLTester.xml
@@ -3203,7 +3203,7 @@
 <data_writer profile_name="writer_xml_conf_resource_limits_profile">
     <topic>
         <resourceLimitsQos>
-            <max_samples>200</max_samples>
+            <max_samples>2000</max_samples>
             <max_instances>20</max_instances>
             <max_samples_per_instance>100</max_samples_per_instance>
             <allocated_samples>50</allocated_samples>
@@ -3214,7 +3214,7 @@
 <data_reader profile_name="reader_xml_conf_resource_limits_profile">
     <topic>
         <resourceLimitsQos>
-            <max_samples>200</max_samples>
+            <max_samples>2000</max_samples>
             <max_instances>20</max_instances>
             <max_samples_per_instance>100</max_samples_per_instance>
             <allocated_samples>50</allocated_samples>