diff --git a/Dockerfile b/Dockerfile
index 906ea1f401..97ee1c7bb2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ARG BASE_IMAGE=debian:bullseye
 FROM ${BASE_IMAGE}