diff --git a/fastrtps.repos b/fastrtps.repos
index 88781745dfc..8b7df5c0cb4 100644
--- a/fastrtps.repos
+++ b/fastrtps.repos
@@ -14,8 +14,12 @@ repositories:
     fastddsgen:
         type: git
         url: https://github.com/eProsima/Fast-DDS-Gen.git
+<<<<<<< HEAD
         version: v2.1.2
     fastddsgen/thirdparty/idl-parser:
         type: git
         url: https://github.com/eProsima/IDL-Parser.git
         version: v1.2.0
+=======
+        version: master
+>>>>>>> 128d23878 (Remove idl parser from .repos file (#4535))