diff --git a/web/package.json b/web/package.json
index 50aa88a..a620131 100644
--- a/web/package.json
+++ b/web/package.json
@@ -20,12 +20,7 @@
     "lint": "eslint ./src --fix",
     "type-check": "tsc"
   },
-  "browserslist": [
-    ">0.2%",
-    "not dead",
-    "not ie <= 11",
-    "not op_mini all"
-  ],
+  "browserslist": [">0.2%", "not dead", "not ie <= 11", "not op_mini all"],
   "devDependencies": {
     "@types/node": "^14.18.45",
     "@types/react": "^18.2.6",
@@ -33,17 +28,9 @@
     "@types/react-router-dom": "^5.1.7",
     "@vitejs/plugin-react": "^2.2.0",
     "autoprefixer": "^10.4.14",
-<<<<<<< Updated upstream
     "cross-env": "^5.2.0",
     "postcss": "^8.4.23",
     "tailwindcss": "^3.3.2",
     "vite": "^3.2.6"
-=======
-    "cross-env": "^7.0.3",
-    "postcss": "^8.4.27",
-    "react-intersection-observer": "^9.5.2",
-    "tailwindcss": "^3.3.3",
-    "vite": "^4.4.8"
->>>>>>> Stashed changes
   }
 }