resolve conflicts

Author: leeyw19837

.gitignore

@@ -7,3 +7,4 @@ build
 /yarn.lock
 
 dist
+/yarn-error.log

app.js

@@ -1,3 +1,7 @@
+/**
+ * Deprecated File Entrance
+ */
+
 require("dotenv").config();
 require("@babel/polyfill");