diff --git a/c/CMake/CMake-3.21.2-GCCcore-9.3.0.eb b/c/CMake/CMake-3.21.2-GCCcore-9.3.0.eb
new file mode 100644
index 00000000..c47d3b46
--- /dev/null
+++ b/c/CMake/CMake-3.21.2-GCCcore-9.3.0.eb
@@ -0,0 +1,36 @@
+# IT4Innovations
+# LK JK 2021
+
+name = 'CMake'
+version = '3.21.2'
+
+homepage = 'https://www.cmake.org'
+
+description = """
+ CMake, the cross-platform, open-source build system.  CMake is a family of
+ tools designed to build, test and package software.
+"""
+
+toolchain = {'name':'GCCcore', 'version':'9.3.0'}
+
+source_urls = ['https://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['94275e0b61c84bb42710f5320a23c6dcb2c6ee032ae7d2a616f53f68b3d21659']
+
+builddependencies = [
+    ('binutils', '2.34'),
+]
+
+dependencies = [
+    ('ncurses', '6.2'),
+    ('zlib', '1.2.11'),
+    ('bzip2', '1.0.8'),
+    ('cURL', '7.72.0'),
+    ('libarchive', '3.4.3'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    #     # it's nice to have an up to date openssl for security reasons
+    #         # ('OpenSSL', '1.1.1h'),
+              ]
+osdependencies = [OS_PKG_OPENSSL_DEV]
+
+moduleclass = 'devel'
diff --git a/p/pymatgen/pymatgen-2022.0.12-foss-2020b.eb b/p/pymatgen/pymatgen-2022.0.12-foss-2020b.eb
index fdad11ed..63fa2e8e 100644
--- a/p/pymatgen/pymatgen-2022.0.12-foss-2020b.eb
+++ b/p/pymatgen/pymatgen-2022.0.12-foss-2020b.eb
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+# taken from develop and updated from 2022.0.4 to 2022.0.12
+=======
 # taken from develop and updated to 2022.0.12 from 2022.0.4
+>>>>>>> 828ac88762b4c4479e53485570fcede5d2b35c47
 # JK
 
 easyblock = 'PythonBundle'