diff --git a/.github/upstream.repos b/.github/upstream.repos
index 692c0e660f..7b078b2f89 100644
--- a/.github/upstream.repos
+++ b/.github/upstream.repos
@@ -15,3 +15,25 @@ repositories:
     type: git
     url: https://github.com/PickNikRobotics/rosparam_shortcuts
     version: ros2
+<<<<<<< HEAD
+=======
+  rviz_visual_tools:
+    type: git
+    url: https://github.com/PickNikRobotics/rviz_visual_tools.git
+    version: ros2
+  # Remove ros2_kortex when rolling binaries are available.
+  ros2_kortex:
+    type: git
+    url: https://github.com/Kinovarobotics/ros2_kortex.git
+    version: main
+  # Remove ros2_robotiq_gripper when rolling binaries are available.
+  ros2_robotiq_gripper:
+    type: git
+    url: https://github.com/PickNikRobotics/ros2_robotiq_gripper.git
+    version: main
+  # Serial is a dependency of ros2_robotiq_gripper. Remove when ros2_robotiq_gripper binaries are available.
+  serial:
+    type: git
+    url: https://github.com/tylerjw/serial.git
+    version: ros2
+>>>>>>> b2cd6c0 (Fix CI  (#826))
diff --git a/doc/examples/planning_adapters/planning_adapters_tutorial.rst b/doc/examples/planning_adapters/planning_adapters_tutorial.rst
index 7e8e29eb17..6e83c4acc2 100644
--- a/doc/examples/planning_adapters/planning_adapters_tutorial.rst
+++ b/doc/examples/planning_adapters/planning_adapters_tutorial.rst
@@ -53,7 +53,7 @@ To achieve this, follow the steps:
                 default_planner_request_adapters/FixStartStatePathConstraints
                 chomp/OptimizerAdapter" />
 
-#. The values of the ``planning_adapters`` is the order in which the mentioned adapters are called / invoked. Order here matters. Inside the CHOMP adapter, a :moveit_codedir:`call <moveit_planners/chomp/chomp_optimizer_adapter/src/chomp_optimizer_adapter.cpp#L169>` to OMPL is made before invoking the CHOMP optimization solver, so CHOMP takes the initial path computed by OMPL as the starting point to further optimize it.
+#. The values of the ``planning_adapters`` is the order in which the mentioned adapters are called / invoked. Order here matters. Inside the CHOMP adapter, a call to OMPL is made before invoking the CHOMP optimization solver, so CHOMP takes the initial path computed by OMPL as the starting point to further optimize it.
 
 #. Find the line where ``<rosparam command="load" file="$(find panda_moveit_config)/config/ompl_planning.yaml"/>`` is mentioned and after this line, add the following: ::
 
diff --git a/moveit2_tutorials.repos b/moveit2_tutorials.repos
index 29017d3235..9858745387 100644
--- a/moveit2_tutorials.repos
+++ b/moveit2_tutorials.repos
@@ -21,7 +21,25 @@ repositories:
     version: ros2
   rosparam_shortcuts:
     type: git
+<<<<<<< HEAD
     url: https://github.com/PickNikRobotics/rosparam_shortcuts
+=======
+    url: https://github.com/Kinovarobotics/ros2_kortex.git
+    version: main
+  # Remove ros2_robotiq_gripper when rolling binaries are available.
+  ros2_robotiq_gripper:
+    type: git
+    url: https://github.com/PickNikRobotics/ros2_robotiq_gripper.git
+    version: main
+  # Serial is a dependency of ros2_robotiq_gripper. Remove when ros2_robotiq_gripper binaries are available.
+  serial:
+    type: git
+    url: https://github.com/tylerjw/serial.git
+    version: ros2
+  rviz_visual_tools:
+    type: git
+    url: https://github.com/PickNikRobotics/rviz_visual_tools.git
+>>>>>>> b2cd6c0 (Fix CI  (#826))
     version: ros2
   srdfdom:
     type: git