diff --git a/env/sles15/aarch64/sysconfigs/packages.yaml b/env/sles15/aarch64/sysconfigs/packages.yaml
index cbe4e96..8bcb169 100644
--- a/env/sles15/aarch64/sysconfigs/packages.yaml
+++ b/env/sles15/aarch64/sysconfigs/packages.yaml
@@ -32,10 +32,7 @@ packages:
   cce:
     externals:
       - modules:
-<<<<<<< Updated upstream
         - libfabric/1.22.0
-=======
->>>>>>> Stashed changes
         - PrgEnv-cray/8.5.0
         - cce/17.0.0
         spec: cce@=17.0.0