diff --git a/Dockerfile b/Dockerfile
index 011edbf..852faeb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,11 @@
+<<<<<<< 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"]