--- a/.docker/Dockerfile-parachain-upgrade-data.j2
+++ b/.docker/Dockerfile-parachain-upgrade-data.j2
@@ -36,11 +36,7 @@
 COPY . /unique_parachain
 WORKDIR /unique_parachain
 
-<<<<<<< HEAD
-RUN cargo build --features={{ NETWORK }}-runtime{{ EXTRA_FEATURES }} --$PROFILE
-=======
-#RUN cargo build --features={{ NETWORK }}-runtime --$PROFILE
->>>>>>> 4e7f3eb75 (test DOCKERFILE for zombienet)
+#RUN cargo build --features={{ NETWORK }}-runtime{{ EXTRA_FEATURES }} --$PROFILE
 
 # ===== RUN ======
 FROM ubuntu:22.04