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