git: merge conflict resolved

Compiler/hdf5_serial/files/config.yaml

@@ -202,3 +202,13 @@ hdf5_serial:
           compiler:
             gcc: [6.5.0, 7.5.0, 8.5.0, 9.5.0, 10.3.0, 11.3.0, 12.1.0]
         relstage: stable
+
+    1.12.3:
+      config:
+        group_deps:
+          compiler:
+            gcc: [7.5.0, 8.5.0, 9.5.0, 10.4.0, 11.3.0, 12.1.0]
+        relstage: unstable
+        urls:
+          - url: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${V_MAJOR}.${V_MINOR}/hdf5-$V/src/hdf5-$V.tar.bz2
+            strip_dirs: 2

Compiler/openmpi/files/config.yaml

@@ -57,8 +57,17 @@ openmpi:
   versions:
     4.1.6:
       variants:
-        - systems: [merlin-*, ra-*]
+        - systems: [merlin-.*]
           suffix: _slurm
+          relstage: unstable
+          overlay: private
+          use_overlays: [private]
+          group_deps:
+            compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 13.1.0]}
+          build_requires: [pmix/4.2.4, ucx/1.14.1_slurm, libfabric/1.18.0, hwloc/2.9.1, patchelf/0.14.5]
+          runtime_deps: [cuda/12.1.1]
+        - systems: [ra-.*]
+          suffix: _ra
           group_deps:
             compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 13.1.0]}
           build_requires: [pmix/4.2.4, ucx/1.14.1_slurm, hwloc/2.9.1, patchelf/0.14.5]