diff --git a/containers/Dockerfile b/containers/Dockerfile
index df7d9e28ae47e7a2f4de2bbe2c6e6b3fa80f110f..5c61787097710241d4b1f970dac8d17341d32daf 100644
--- a/containers/Dockerfile
+++ b/containers/Dockerfile
@@ -141,11 +141,7 @@ RUN apt-get install -y automake  &&\
 WORKDIR /install_dir/FastME/tarball
 RUN tar xzf fastme-2.1.6.4.tar.gz &&\
     rm fastme-2.1.6.4.tar.gz &&\
-<<<<<<< HEAD
-    ln -s /install_dir/FastME/tarball/fastme-2.1.6.2/binaries/fastme-2.1.6.4-linux64-omp /usr/local/bin/fastme
-=======
     ln -s /install_dir/FastME/tarball/fastme-2.1.6.4/binaries/fastme-2.1.6.2-linux64-omp /usr/local/bin/fastme
->>>>>>> dev
 
 # Install quicktree
 WORKDIR /install_dir