fixing merge conflict

package.json

@@ -1,7 +1,7 @@
 {
   "name": "balistics-builder",
   "version": "0.1.0",
-  "private": true,
+  "private": "true",
   "scripts": {
     "dev": "next dev",
     "build": "next build",
@@ -18,21 +18,26 @@
     "@mui/system": "^6.1.7",
     "@mui/x-data-grid": "^7.22.2",
     "@prisma/client": "^5.22.0",
+    "dotenv": "^16.4.5",
     "drizzle-orm": "^0.36.3",
     "fontsource-roboto": "^4.0.0",
     "next": "15.0.3",
+    "pg": "^8.13.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",
+    "@types/pg": "^8.11.10",
     "@types/react": "^18",
     "@types/react-dom": "^18",
+    "autoprefixer": "^10.4.20",
+    "drizzle-kit": "^0.28.1",
     "eslint": "^8",
     "eslint-config-next": "15.0.3",
     "postcss": "^8",
     "prisma": "^5.22.0",
-    "tailwindcss": "^3.4.1",
+    "tailwindcss": "^3.4.15",
     "tsx": "^4.19.2",
     "typescript": "^5.6.3"
   }