dropbucket
diff --git a/‎package-lock.json
+13 b/‎package-lock.json
+13
diff --git a/‎package.json
+5 b/‎package.json
+5
@@ -13,8 +13,13 @@
     "debug": "~2.6.9",
     "dotenv": "^9.0.2",
     "express": "~4.16.1",
+<<<<<<< HEAD
     "express-jwt": "^6.0.0",
     "jwt-decode": "^3.1.2",
+=======
+    "jwt-decode": "^3.1.2",
+    "express-jwt": "^6.0.0",
+>>>>>>> hwanhee
     "morgan": "~1.9.1",
     "multer": "^1.4.2",
     "multer-s3": "^2.9.0",