merge conflict

Change-Id: I4c784028cd7aa8e612563eac0fce3dda91631638
diff --git a/Dockerfile b/Dockerfile
index 385cb2f..ae06f8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,5 +10,7 @@
 FROM nginx:alpine
 COPY --from=build /app/dist  /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/conf.d/default.conf
+
 EXPOSE 3004
+
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file