diff --git a/coffea-dask/Dockerfile.almalinux8 b/coffea-dask/Dockerfile.almalinux8
index 766a79c..3bcfde3 100644
--- a/coffea-dask/Dockerfile.almalinux8
+++ b/coffea-dask/Dockerfile.almalinux8
@@ -8,15 +8,9 @@ ENV PYTHON_VERSION=${python}
 RUN yum -y install epel-release \
      && yum -y update \
      && yum -y install wget git bzip2 libgfortran which zsh emacs vim htop man man-pages \
-<<<<<<< HEAD
      && curl -fsSLo Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" \
      && bash Miniforge3.sh -bfp /usr/local \
      && rm -rf Miniforge3.sh \
-=======
-     && curl -sSL https://github.com/conda-forge/miniforge/releases/download/latest/Mambaforge-Linux-x86_64.sh -o /tmp/mambaforge.sh \
-     && bash /tmp/mambaforge.sh -bfp /usr/local \
-     && rm -rf /tmp/mambaforge.sh \
->>>>>>> 254ea9d (Update mambaforge to support python 3.12)
      && mamba update mamba \
      && mamba clean --all --yes \
      && rpm -e --nodeps curl bzip2 \