Fixed conflicts in package.json

Author: leontm-dev

package.json

@@ -11,43 +11,20 @@
     "url": "https://leontm.me"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "@fontsource-variable/inter": "^5.2.8",
-    "@radix-ui/react-accordion": "^1.2.2",
-    "@radix-ui/react-avatar": "^1.1.2",
-    "@radix-ui/react-dropdown-menu": "^2.1.4",
-    "@radix-ui/react-separator": "^1.1.1",
-    "@radix-ui/react-slot": "^1.1.1",
-    "@radix-ui/react-switch": "^1.1.2",
-    "@radix-ui/react-tabs": "^1.1.2",
-    "@radix-ui/react-tooltip": "^1.1.6",
-    "@types/node": "^22.5.5",
-    "class-variance-authority": "^0.7.1",
-    "clsx": "^2.1.1",
-    "embla-carousel-react": "^8.6.0",
-    "loaders.css": "^0.1.2",
-    "lucide-react": "^1.8.0",
-    "prop-types": "^15.8.1",
-=======
     "@tailwindcss/postcss": "^4.2.2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^1.8.0",
     "postcss": "^8.5.9",
->>>>>>> 4fe108525c56bd94c30986cf7e6683bbfd3d53c9
     "radix-ui": "^1.4.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-spinners": "^0.15.0",
     "shadcn": "^4.2.0",
     "tailwind-merge": "^3.5.0",
     "tailwindcss-animate": "^1.0.7",
-<<<<<<< HEAD
     "tw-animate-css": "^1.4.0",
     "vite-plugin-static-copy": "^2.3.2"
-=======
-    "vite-plugin-static-copy": "^1.0.6"
->>>>>>> 4fe108525c56bd94c30986cf7e6683bbfd3d53c9
   },
   "devDependencies": {
     "@eslint/js": "^9.9.0",