diff --git a/backend/Dockerfile b/backend/Dockerfile
index 5bb29ea..8178129 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,11 +1,6 @@
 #### BUILDER IMAGE -- quite big one ####
-<<<<<<< HEAD
-FROM paritytech/musl-ci-linux as builder
-LABEL maintainer="Parity Technologies"
-=======
 FROM paritytech/ci-linux:production as builder
-LABEL maintainer="Daniel Maricic daniel@woss.io"
->>>>>>> origin/master
+LABEL maintainer="Parity Technologies"
 LABEL description="Polkadot Telemetry backend builder image"
 
 ARG PROFILE=release