diff --git a/.github/workflows/ci-iron.yaml b/.github/workflows/ci-iron.yaml
index 0388719b..81837e0e 100644
--- a/.github/workflows/ci-iron.yaml
+++ b/.github/workflows/ci-iron.yaml
@@ -1,20 +1,14 @@
 name: gz_ros2_control CI - Iron
 
 on:
-<<<<<<< HEAD
-=======
   workflow_dispatch:
->>>>>>> 38504d1 (Scheduled CI for Iron (#401))
   pull_request:
     branches: [ iron ]
   push:
     branches: [ iron ]
-<<<<<<< HEAD
-=======
   schedule:
     # Run every morning to detect flakiness and broken dependencies
     - cron: '33 4 * * *'
->>>>>>> 38504d1 (Scheduled CI for Iron (#401))
 
 jobs:
   build:
@@ -48,9 +42,6 @@ jobs:
     container:
       image: ${{ matrix.docker-image }}
     steps:
-<<<<<<< HEAD
-    - uses: actions/checkout@v4
-=======
     - name: Checkout code
       if: github.event_name != 'schedule'
       uses: actions/checkout@v4
@@ -59,7 +50,6 @@ jobs:
       uses: actions/checkout@v4
       with:
         ref: iron
->>>>>>> 38504d1 (Scheduled CI for Iron (#401))
     - name: Setup colcon workspace
       id: configure
       shell: bash