diff --git a/.github/workflows/ubuntu18.yml b/.github/workflows/ubuntu18.yml
index 6d02d41..ab292b6 100644
--- a/.github/workflows/ubuntu18.yml
+++ b/.github/workflows/ubuntu18.yml
@@ -15,13 +15,10 @@ jobs:
           - {cxx:                           , arch: -DCMAKE_CXX_FLAGS="-m32"} # default=gcc7
     steps:
       - uses: actions/checkout@v2
-<<<<<<< HEAD
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v1.4
         with:
           cmake-version: '3.9.x'
-=======
->>>>>>> main
       - name: Install older compilers
         run: |
           sudo -E dpkg --add-architecture i386