diff --git a/docker/Dockerfile.cpu b/docker/Dockerfile.cpu
index 20a95d04bfa..f0d46352ba8 100644
--- a/docker/Dockerfile.cpu
+++ b/docker/Dockerfile.cpu
@@ -3,11 +3,7 @@
 # This Dockerfile contains the Devito codes and can be built using different base images.
 ##############################################################
 
-<<<<<<< HEAD
-ARG pyversion=python:3.9
-=======
 ARG pyversion=python:3.8
->>>>>>> 66c0b76b5 (ci: Update python versions, end-of-life for python 3.7)
 ARG arch=gcc
 ARG OMPI_BRANCH="v4.1.4"