diff --git a/doc/migration/migration.rst b/doc/migration/migration.rst
index d535f582e20..28da91e95e7 100644
--- a/doc/migration/migration.rst
+++ b/doc/migration/migration.rst
@@ -21,12 +21,7 @@ ros2_control
 .. toctree::
    :titlesonly:
 
-<<<<<<< HEAD
-   Foxy to Galactic <../ros2_control/doc/migration/Foxy.rst>
-=======
    Foxy to Galactic <../ros2_control/doc/migration/Galactic.rst>
-   Iron to Jazzy <../ros2_control/doc/migration/Jazzy.rst>
->>>>>>> d0bf5bd (Rename migration notes file  (#300))
 
 
 ros2_controllers