chore: fix package conflicts

Author: ScriptedAlchemy

apps/3001-shop/package.json

@@ -13,19 +13,10 @@
   "devDependencies": {
     "@module-federation/nextjs-mf": "workspace:*",
     "@module-federation/runtime": "workspace:*",
-<<<<<<< HEAD
-<<<<<<< HEAD
     "@module-federation/sdk": "workspace:*",
     "@types/react": "18.3.11",
     "@types/react-dom": "18.3.0",
     "webpack": "5.98.0"
-=======
-    "@module-federation/sdk": "workspace:*"
->>>>>>> e644b8fe8 (chore: update cmd syntax exit)
-=======
-    "@module-federation/sdk": "workspace:*",
-    "webpack": "^5.98.0"
->>>>>>> 2a2337ae2 (feat: merge increment C - core package dependencies)
   },
   "scripts": {
     "start": "next start",

apps/3002-checkout/package.json

@@ -13,19 +13,10 @@
   "devDependencies": {
     "@module-federation/nextjs-mf": "workspace:*",
     "@module-federation/runtime": "workspace:*",
-<<<<<<< HEAD
-<<<<<<< HEAD
     "@module-federation/sdk": "workspace:*",
     "@types/react": "18.3.11",
     "@types/react-dom": "18.3.0",
     "webpack": "5.98.0"
-=======
-    "@module-federation/sdk": "workspace:*"
->>>>>>> e644b8fe8 (chore: update cmd syntax exit)
-=======
-    "@module-federation/sdk": "workspace:*",
-    "webpack": "^5.98.0"
->>>>>>> 2a2337ae2 (feat: merge increment C - core package dependencies)
   },
   "scripts": {
     "start": "next start",

packages/bridge/bridge-react/package.json

@@ -110,16 +110,7 @@
   },
   "devDependencies": {
     "@testing-library/react": "15.0.7",
-<<<<<<< HEAD
     "@testing-library/jest-dom": "6.6.3",
-    "@types/react": "18.2.79",
-    "@types/react-dom": "18.3.0",
-    "@vitejs/plugin-react": "^4.3.3",
-    "@vitejs/plugin-vue": "^5.0.4",
-    "@vitejs/plugin-vue-jsx": "^4.0.0",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
-=======
     "@types/react": "19.0.0",
     "@types/react-dom": "19.0.0",
     "@vitejs/plugin-react": "^4.3.3",
@@ -128,7 +119,6 @@
     "jsdom": "^24.1.0",
     "react": "19.0.0",
     "react-dom": "19.0.0",
->>>>>>> 4eec06a46 (fix: update packages to React 19 individually instead of global overrides)
     "react-router-dom": "6.22.3",
     "typescript": "^5.2.2",
     "vite": "^5.4.18",

packages/utilities/package.json

@@ -18,12 +18,8 @@
     "directory": "packages/utilities"
   },
   "devDependencies": {
-<<<<<<< HEAD
-    "react": "18.3.1",
+    "react": "19.0.0",
     "@types/react": "^18.3.11"
-=======
-    "react": "19.0.0"
->>>>>>> 4eec06a46 (fix: update packages to React 19 individually instead of global overrides)
   },
   "dependencies": {
     "@module-federation/sdk": "workspace:*"