Missed rebase updates

Author: thatblindgeye

package-lock.json

@@ -33,19 +33,11 @@
     "tag": "prerelease"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "@patternfly/react-code-editor": "^6.1.0",
-    "@patternfly/react-core": "^6.1.0",
-    "@patternfly/react-icons": "^6.5.1",
-    "@patternfly/react-styles": "^6.1.0",
-    "@patternfly/react-table": "^6.1.0",
-=======
     "@patternfly/react-code-editor": "^6.5.1",
     "@patternfly/react-core": "^6.5.1",
     "@patternfly/react-icons": "^6.5.1",
     "@patternfly/react-styles": "^6.5.1",
     "@patternfly/react-table": "^6.5.1",
->>>>>>> 5d910d9 (feat(Chatbot): applied glass and felt tokens)
     "@segment/analytics-next": "^1.76.0",
     "clsx": "^2.1.0",
     "path-browserify": "^1.0.1",