diff --git a/code/XMLTester.xml b/code/XMLTester.xml
index 31691445a..f4f4f1753 100644
--- a/code/XMLTester.xml
+++ b/code/XMLTester.xml
@@ -4389,6 +4389,7 @@
<-->
+<<<<<<< HEAD
XML_RELIABILITY<-->
@@ -4401,6 +4402,48 @@
+=======
+XML-GENERIC<-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<-->
+
+XML-MEMBER_WITH_KEY<-->
+
+<-->
+XML-BOUNDEDSTRINGS<-->
+
+
+<-->
+XML-SEQUENCES<-->
+
+<-->
+XML-ARRAYS<-->
+
+<-->
+XML-MAPS<-->
+
+<-->
+
+>>>>>>> f95e5c9 (Document how to annotate member as key in XMl types (#746))
diff --git a/docs/fastdds/xml_configuration/dynamic_types.rst b/docs/fastdds/xml_configuration/dynamic_types.rst
index 1bc5cd40c..62a1936af 100644
--- a/docs/fastdds/xml_configuration/dynamic_types.rst
+++ b/docs/fastdds/xml_configuration/dynamic_types.rst
@@ -161,6 +161,12 @@ Member types
Member types are defined as any type that can belong to a ```` or a ````, or be aliased by a
````.
These can be defined by the ```` XML tag.
+A member can be annotated as ``key`` (equivalent of the IDL's ``@key``) by setting the ``key`` attribute to ``"true"``.
+
+.. literalinclude:: /../code/XMLTester.xml
+ :language: xml
+ :start-after: XML-MEMBER_WITH_KEY<-->
+ :end-before: <-->
Primitive types
***************