diff --git a/.github/workflows/humble-debian-build.yml b/.github/workflows/humble-debian-build.yml
index 2400c9d39e..3a06c3fc37 100644
--- a/.github/workflows/humble-debian-build.yml
+++ b/.github/workflows/humble-debian-build.yml
@@ -12,28 +12,9 @@ on:
 jobs:
   humble_debian:
     name: Humble debian build
-<<<<<<< HEAD
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: humble
-    container: ghcr.io/ros-controls/ros:humble-debian
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Build and test
-        shell: bash
-        run: |
-          source /opt/ros2_ws/install/setup.bash
-          vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos
-          colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller control_msgs controller_manager_msgs
-          colcon test-result --verbose
-=======
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
     with:
       ros_distro: humble
       upstream_workspace: ros2_controllers.humble.repos
       ref_for_scheduled_build: humble
       skip_packages: rqt_joint_trajectory_controller
->>>>>>> cb6884a (Use reusable wfs from ros2_control_ci and use matrix strategy (#1040))
diff --git a/.github/workflows/humble-rhel-semi-binary-build.yml b/.github/workflows/humble-rhel-semi-binary-build.yml
index 65abeb1bc1..1d1fe0522f 100644
--- a/.github/workflows/humble-rhel-semi-binary-build.yml
+++ b/.github/workflows/humble-rhel-semi-binary-build.yml
@@ -11,31 +11,9 @@ on:
 jobs:
   humble_rhel_binary:
     name: Humble RHEL binary build
-<<<<<<< HEAD:.github/workflows/humble-rhel-binary-build.yml
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: humble
-    container: ghcr.io/ros-controls/ros:humble-rhel
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Install dependencies
-        run: |
-          rosdep update
-          rosdep install -iyr --from-path src/ros2_controllers || true
-      - name: Build and test
-        run: |
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          source /opt/ros2_ws/install/setup.bash
-          colcon build --packages-skip rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_joint_trajectory_controller
-          colcon test-result --verbose
-=======
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
     with:
       ros_distro: humble
       upstream_workspace: ros2_controllers.humble.repos
       ref_for_scheduled_build: humble
       skip_packages: rqt_joint_trajectory_controller
->>>>>>> cb6884a (Use reusable wfs from ros2_control_ci and use matrix strategy (#1040)):.github/workflows/humble-rhel-semi-binary-build.yml
diff --git a/.github/workflows/iron-debian-build.yml b/.github/workflows/iron-debian-build.yml
index 61a633b683..f3419c1a31 100644
--- a/.github/workflows/iron-debian-build.yml
+++ b/.github/workflows/iron-debian-build.yml
@@ -12,28 +12,9 @@ on:
 jobs:
   iron_debian:
     name: Iron debian build
-<<<<<<< HEAD
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: iron
-    container: ghcr.io/ros-controls/ros:iron-debian
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Build and test
-        shell: bash
-        run: |
-          source /opt/ros2_ws/install/setup.bash
-          vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos
-          colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller control_msgs controller_manager_msgs
-          colcon test-result --verbose
-=======
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
     with:
       ros_distro: iron
       upstream_workspace: ros2_controllers.iron.repos
       ref_for_scheduled_build: iron
       skip_packages: rqt_joint_trajectory_controller
->>>>>>> cb6884a (Use reusable wfs from ros2_control_ci and use matrix strategy (#1040))
diff --git a/.github/workflows/rolling-debian-build.yml b/.github/workflows/rolling-debian-build.yml
index 2c8c4446ed..a1aed8b415 100644
--- a/.github/workflows/rolling-debian-build.yml
+++ b/.github/workflows/rolling-debian-build.yml
@@ -12,28 +12,9 @@ on:
 jobs:
   rolling_debian:
     name: Rolling debian build
-<<<<<<< HEAD
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: rolling
-    container: ghcr.io/ros-controls/ros:rolling-debian
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Build and test
-        shell: bash
-        run: |
-          source /opt/ros2_ws/install/setup.bash
-          vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos
-          colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
-          colcon test-result --verbose
-=======
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
     with:
       ros_distro: rolling
       upstream_workspace: ros2_controllers.rolling.repos
       ref_for_scheduled_build: master
       skip_packages: rqt_joint_trajectory_controller
->>>>>>> cb6884a (Use reusable wfs from ros2_control_ci and use matrix strategy (#1040))
diff --git a/.github/workflows/rolling-rhel-semi-binary-build.yml b/.github/workflows/rolling-rhel-semi-binary-build.yml
index aff265da57..a175d951b4 100644
--- a/.github/workflows/rolling-rhel-semi-binary-build.yml
+++ b/.github/workflows/rolling-rhel-semi-binary-build.yml
@@ -10,30 +10,6 @@ on:
 
 
 jobs:
-<<<<<<< HEAD:.github/workflows/rolling-rhel-binary-build.yml
-  rolling_rhel_binary:
-    name: Rolling RHEL binary build
-    runs-on: ubuntu-latest
-    env:
-      ROS_DISTRO: rolling
-    container: ghcr.io/ros-controls/ros:rolling-rhel
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: src/ros2_controllers
-      - name: Install dependencies
-        run: |
-          rosdep update
-          rosdep install -iyr --from-path src/ros2_controllers || true
-      - name: Build and test
-        # source also underlay workspace with generate_parameter_library on rhel9
-        run: |
-          source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
-          source /opt/ros2_ws/install/setup.bash
-          colcon build --packages-skip rqt_joint_trajectory_controller
-          colcon test --packages-skip rqt_joint_trajectory_controller
-          colcon test-result --verbose
-=======
   rolling_rhel:
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
     with:
@@ -41,4 +17,3 @@ jobs:
       upstream_workspace: ros2_controllers.rolling.repos
       ref_for_scheduled_build: master
       skip_packages: rqt_joint_trajectory_controller
->>>>>>> cb6884a (Use reusable wfs from ros2_control_ci and use matrix strategy (#1040)):.github/workflows/rolling-rhel-semi-binary-build.yml