diff --git a/docker/Dockerfile b/docker/Dockerfile
index 38e1a83..1ed60d6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 FROM jlesage/baseimage-gui:debian-10
 
 ENV APP_NAME="Gnutella"