diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 23a7a9e8..b2da3cea 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM registry.suse.com/bci/bci-base:15.5
-=======
 FROM registry.suse.com/bci/golang:1.22
->>>>>>> d1662b2 (ci: use golang bci instead of manual download)
 
 ARG DAPPER_HOST_ARCH
 ARG http_proxy