diff --git a/Dockerfile b/Dockerfile
index c6b048ab..d1a01346 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -262,39 +262,6 @@ ENV IMAGE="slim"
 # Store the key here because the above host is sometimes down, and breaks our builds
 COPY dependencies/sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
 
-<<<<<<< HEAD
-######################################
-# Install Phive dependencies and git #
-######################################
-RUN wget --tries=5 -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk \
-    && apk update && apk upgrade && apk add --no-cache --force-overwrite \
-    bash \
-    ca-certificates \
-    curl \
-    git git-lfs \
-    glibc-${GLIBC_VERSION}.apk \
-    tar zstd \
-    gnupg \
-    php81 php81-curl php81-ctype php81-dom php81-iconv php81-mbstring \
-    php81-openssl php81-phar php81-simplexml php81-tokenizer php81-xmlwriter \
-    && rm glibc-${GLIBC_VERSION}.apk \
-    && wget -q --tries=5 -O /tmp/libz.tar.zst https://www.archlinux.org/packages/core/x86_64/zlib/download \
-    && mkdir /tmp/libz \
-    && tar -xf /tmp/libz.tar.zst -C /tmp/libz --zstd \
-    && mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib \
-    && rm -rf /tmp/libz /tmp/libz.tar.zst \
-    && wget -q --tries=5 -O phive.phar https://phar.io/releases/phive.phar \
-    && wget -q --tries=5 -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
-    && PHAR_KEY_ID="0x9D8A98B29B2D5D79" \
-    && gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "$PHAR_KEY_ID" \
-    && gpg --verify phive.phar.asc phive.phar \
-    && chmod +x phive.phar \
-    && mv phive.phar /usr/local/bin/phive \
-    && rm phive.phar.asc \
-    && phive --no-progress install --trust-gpg-keys \
-    31C7E470E2138192,CF1A108D0E7AE720,8A03EA3B385DBAA1,12CE0F1D262429A5 \
-    --target /usr/bin phpstan@^1.3.3 psalm@^4.18.1 phpcs@^3.6.2
-=======
 ###############
 # Install Git #
 ###############
@@ -305,7 +272,6 @@ RUN apk add --no-cache bash git git-lfs
 ##############################
 COPY scripts/install-phive.sh /
 RUN /install-phive.sh && rm -rf /install-phive.sh
->>>>>>> 65949c12 (Push scripts into standalone files)
 
 ####################################################
 # Install Composer after all Libs have been copied #