diff --git a/Dockerfile b/Dockerfile
index 852faeb..011edbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,5 @@
-<<<<<<< HEAD
 FROM alpine:3.14
 RUN \
   apk -U upgrade && apk add mosquitto mosquitto-clients openssl && \
   echo "log_dest stdout" >/etc/mosquitto/mosquitto.conf
-=======
-FROM alpine:3.12
-RUN apk -U upgrade && apk add mosquitto mosquitto-clients openssl
-EXPOSE 8883
->>>>>>> master
 ENTRYPOINT ["mosquitto", "-c", "/etc/mosquitto/mosquitto.conf"]