merge and resolve conflict

package.json

@@ -7,7 +7,8 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,html,css,scss}\""
+    "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,html,css,scss}\"",
+    "build:publish": "npm i && npm run build && pm2 restart ecosystem.config.js"
   },
   "dependencies": {
     "@emotion/cache": "^11.11.0",
@@ -17,6 +18,7 @@
     "@mui/material": "^5.15.6",
     "@mui/material-nextjs": "^5.15.6",
     "@mui/x-date-pickers": "^6.19.5",
+    "axios": "^1.7.2",
     "date-fns": "^3.3.1",
     "date-fns-jalali": "^2.13.0-0",
     "dayjs": "^1.11.10",
@@ -36,6 +38,7 @@
   "devDependencies": {
     "eslint": "^8",
     "eslint-config-next": "14.1.0",
+    "eslint-config-prettier": "^9.1.0",
     "prettier": "^3.3.2"
   }
 }