diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index cc1c80150cb..1961f13dd01 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -45,15 +45,25 @@
     "subpaths": "node ../../scripts/exportSubpaths.js --config subpaths.config.json"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@patternfly/react-icons": "^5.1.1-prerelease.0",
     "@patternfly/react-styles": "^5.1.1-prerelease.0",
     "@patternfly/react-tokens": "^5.1.1-prerelease.0",
+=======
+    "@patternfly/react-icons": "^5.0.0-prerelease.9",
+    "@patternfly/react-styles": "^5.0.0-prerelease.7",
+    "@patternfly/react-tokens": "^5.0.0-prerelease.9",
+>>>>>>> 0d5ec4fd2 (Rebase postv5 (#9393))
     "focus-trap": "7.4.3",
     "react-dropzone": "^14.2.3",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
+<<<<<<< HEAD
     "@patternfly/patternfly": "5.0.2",
+=======
+    "@patternfly/patternfly": "5.0.0-prerelease.16",
+>>>>>>> 0d5ec4fd2 (Rebase postv5 (#9393))
     "@rollup/plugin-commonjs": "^25.0.0",
     "@rollup/plugin-node-resolve": "^15.0.2",
     "@rollup/plugin-replace": "^5.0.2",
diff --git a/packages/react-core/src/components/Toolbar/__tests__/Generated/__snapshots__/ToolbarChipGroupContent.test.tsx.snap b/packages/react-core/src/components/Toolbar/__tests__/Generated/__snapshots__/ToolbarChipGroupContent.test.tsx.snap
index 8135d2d9540..7e27658c62a 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/Generated/__snapshots__/ToolbarChipGroupContent.test.tsx.snap
+++ b/packages/react-core/src/components/Toolbar/__tests__/Generated/__snapshots__/ToolbarChipGroupContent.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`ToolbarChipGroupContent should match snapshot (auto-generated) 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v5-c-toolbar__content pf-m-hidden string"
+    class="pf-v5-c-toolbar__content pf-m-chip-container pf-m-hidden string"
     hidden=""
   >
     <div
diff --git a/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap b/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
index 31e809b78b6..ed402cfa123 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
+++ b/packages/react-core/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap
@@ -44,7 +44,7 @@ exports[`Toolbar should render inset 1`] = `
       </div>
     </div>
     <div
-      class="pf-v5-c-toolbar__content pf-m-hidden"
+      class="pf-v5-c-toolbar__content pf-m-chip-container pf-m-hidden"
       hidden=""
     >
       <div
@@ -395,7 +395,7 @@ exports[`Toolbar should render with page inset flag 1`] = `
       </div>
     </div>
     <div
-      class="pf-v5-c-toolbar__content pf-m-hidden"
+      class="pf-v5-c-toolbar__content pf-m-chip-container pf-m-hidden"
       hidden=""
     >
       <div