diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index c5cde4e..5e36dd0 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 
 OPENSSL_REPO="https://github.com/openssl/openssl.git"
+<<<<<<< HEAD
 
+=======
+>>>>>>> 8f268fa17dc92ff150c6a10e4c0e0512e050d5ca
 OPENSSL_COMMIT="OpenSSL_1_1_1k"
 
 ffbuild_enabled() {
diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh
index 346c56e..f58bb02 100755
--- a/scripts.d/50-gme.sh
+++ b/scripts.d/50-gme.sh
@@ -13,8 +13,9 @@ ffbuild_dockerstage() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$GME_REPO" "$GME_COMMIT" gme
+    git clone "$GME_REPO" gme
     cd gme
+    git checkout "$GME_COMMIT"
 
     mkdir build && cd build