diff --git a/docker/Dockerfile b/docker/Dockerfile
index 29b27dde..5810825a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 FROM docker.io/golang:1.13.7-alpine3.11
-=======
-FROM docker.io/golang:1.13.6-alpine
->>>>>>> master
 
 RUN mkdir /build