chore: resolve conflicts between main and develop

Author: swarajpure

package-lock.json

@@ -14,7 +14,7 @@
     "generate-api-schema": "node utils/generateAPISchema.js"
   },
   "dependencies": {
-    "axios": "^0.21.1",
+    "axios": "^0.21.2",
     "cloudinary": "^1.25.1",
     "config": "^3.3.6",
     "cookie-parser": "~1.4.5",