diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 89155ce2..8ad261d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,18 +49,8 @@ jobs:
         with:
           version: "${{ matrix.NXF_VER }}"
 
-<<<<<<< HEAD
       - name: Disk space cleanup
         uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
-=======
-      - name: Show current locale
-        run: locale
-
-      - name: Set UTF-8 enabled locale
-        run: |
-          sudo locale-gen en_US.UTF-8
-          sudo update-locale LANG=en_US.UTF-8
->>>>>>> dev
 
       - name: Run pipeline with test data
         run: |