diff --git a/.circleci/config.yml b/.circleci/config.yml
index 19c70c91..61858e8b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,11 +26,7 @@ jobs:
             sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
             LATEST_TAG="${CIRCLE_TAG:1}"
             DOCKERHUB_DESTINATION="$DOCKERHUB_REPO:$LATEST_TAG-arm32v7"
-<<<<<<< HEAD
             DOCKERHUB_DOCKERFILE="Dockerfile.arm32v7"
-=======
-            DOCKERHUB_DOCKERFILE="Dockerfile"
->>>>>>> upstream/master
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker build --pull -t "$DOCKERHUB_DESTINATION" -f "$DOCKERHUB_DOCKERFILE" .
             sudo docker push "$DOCKERHUB_DESTINATION"