diff --git a/.github/workflows/spack_cpu_build.yaml b/.github/workflows/spack_cpu_build.yaml
index ea834104..a342c9e8 100644
--- a/.github/workflows/spack_cpu_build.yaml
+++ b/.github/workflows/spack_cpu_build.yaml
@@ -14,27 +14,18 @@ jobs:
         # Minimal Build(s)
         # Need S3 mirror to have these builds speedup
         spack_spec:
-<<<<<<< HEAD
           # See #39 - ~python~mpi causes issues
         # - exago@develop~mpi~ipopt~hiop~python~raja
           # See #44 - +mpi~python should fail if no python in system,
           #                       but the runner happens to have one...
-=======
-          # Minimal Build
-           # See #18 
-        # - exago@develop~mpi~ipopt~hiop~python~raja
->>>>>>> 13ef94e... Update summit modules (#21)
           - exago@develop+mpi~ipopt+hiop~python~raja ^openmpi
           # See #18 - +hiop~mpi causes issues
         # - exago@develop~mpi~ipopt+hiop~python+raja
           # See #16 - +python~mpi causes issues
         # - exago@develop~mpi~ipopt+hiop+python~raja
           - exago@develop+mpi~ipopt+hiop+python~raja ^openmpi
-<<<<<<< HEAD
           # See #40 - +hiop+raja~ipopt ^hiop~sparse is useful for edge cases
           - exago@develop+mpi~ipopt+hiop~python+raja ^openmpi ^hiop+raja~sparse 
-=======
->>>>>>> 13ef94e... Update summit modules (#21)
 
     name: Build ExaGO with Spack
     steps: