diff --git a/.config/configstore/update-notifier-npm.json b/.config/configstore/update-notifier-npm.json
new file mode 100644
index 0000000000000000000000000000000000000000..62751190942f686201ec2522e06a1ca6fb24992f
--- /dev/null
+++ b/.config/configstore/update-notifier-npm.json
@@ -0,0 +1,4 @@
+{
+	"optOut": false,
+	"lastUpdateCheck": 1525596746559
+}
\ No newline at end of file
diff --git a/Dockerfile-development b/Dockerfile-development
index 93c2ee289189e582eeada37eff720419a02853a5..f3fa516adb68860a47403b52a037ffcb98970d56 100644
--- a/Dockerfile-development
+++ b/Dockerfile-development
@@ -9,6 +9,10 @@ COPY webpack webpack
 COPY config config
 COPY app app
 
+<<<<<<< HEAD
 EXPOSE ${PORT:-3000}
+=======
+EXPOSE ${PORT:3000}
+>>>>>>> add env-sample add Dockerfile production
 
 CMD []