diff --git a/package-lock.json b/package-lock.json
index 4d215510b..7840e681d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58318,11 +58318,7 @@
         "@awsui/components-react": "^3.0.0",
         "@awsui/design-tokens": "^3.0.41",
         "@iot-app-kit/core": "9.9.0",
-<<<<<<< HEAD
         "@iot-app-kit/related-table": "9.9.0",
-=======
-        "@iot-app-kit/related-table": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@stencil/core": "^2.7.0",
         "@synchro-charts/core": "7.2.0",
         "styled-components": "^5.3.11"
@@ -59519,19 +59515,11 @@
         "@aws-sdk/client-iotsitewise": "3.456.0",
         "@aws-sdk/client-iottwinmaker": "3.354.0",
         "@iot-app-kit/charts-core": "^2.1.1",
-<<<<<<< HEAD
         "@iot-app-kit/components": "9.9.0",
         "@iot-app-kit/core": "9.9.0",
         "@iot-app-kit/core-util": "9.9.0",
         "@iot-app-kit/react-components": "9.9.0",
         "@iot-app-kit/source-iotsitewise": "9.9.0",
-=======
-        "@iot-app-kit/components": "9.8.0",
-        "@iot-app-kit/core": "9.9.0",
-        "@iot-app-kit/core-util": "9.8.0",
-        "@iot-app-kit/react-components": "9.8.0",
-        "@iot-app-kit/source-iotsitewise": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@popperjs/core": "^2.11.8",
         "@tanstack/react-query": "^4.29.15",
         "aws-sdk-client-mock": "^3.0.0",
@@ -61103,17 +61091,10 @@
         "@cloudscape-design/design-tokens": "3.0.15",
         "@iot-app-kit/charts": "^2.1.1",
         "@iot-app-kit/charts-core": "^2.1.1",
-<<<<<<< HEAD
         "@iot-app-kit/components": "9.9.0",
         "@iot-app-kit/core": "9.9.0",
         "@iot-app-kit/core-util": "9.9.0",
         "@iot-app-kit/source-iottwinmaker": "9.9.0",
-=======
-        "@iot-app-kit/components": "9.8.0",
-        "@iot-app-kit/core": "9.9.0",
-        "@iot-app-kit/core-util": "9.8.0",
-        "@iot-app-kit/source-iottwinmaker": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "color": "^4.2.3",
         "copy-to-clipboard": "^3.3.3",
         "d3-array": "^3.2.3",
@@ -61144,17 +61125,10 @@
       },
       "devDependencies": {
         "@iot-app-kit/core": "9.9.0",
-<<<<<<< HEAD
         "@iot-app-kit/jest-config": "9.9.0",
         "@iot-app-kit/source-iotsitewise": "9.9.0",
         "@iot-app-kit/testing-util": "9.9.0",
         "@iot-app-kit/ts-config": "9.9.0",
-=======
-        "@iot-app-kit/jest-config": "9.8.0",
-        "@iot-app-kit/source-iotsitewise": "9.8.0",
-        "@iot-app-kit/testing-util": "9.8.0",
-        "@iot-app-kit/ts-config": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@jest/globals": "^29.5.0",
         "@storybook/addon-essentials": "^6.5.16",
         "@storybook/addon-links": "^6.5.16",
@@ -62265,15 +62239,9 @@
         "@fortawesome/free-solid-svg-icons": "^6.4.2",
         "@fortawesome/react-fontawesome": "^0.2.0",
         "@iot-app-kit/core": "9.9.0",
-<<<<<<< HEAD
         "@iot-app-kit/react-components": "9.9.0",
         "@iot-app-kit/related-table": "9.9.0",
         "@iot-app-kit/source-iottwinmaker": "9.9.0",
-=======
-        "@iot-app-kit/react-components": "9.8.0",
-        "@iot-app-kit/related-table": "9.8.0",
-        "@iot-app-kit/source-iottwinmaker": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@matterport/r3f": "0.2.7",
         "@matterport/webcomponent": "0.1.35",
         "@react-three/drei": "9.56.27",
@@ -62773,11 +62741,7 @@
         "@aws-sdk/client-iot-events": "3.354.0",
         "@aws-sdk/client-iotsitewise": "3.456.0",
         "@iot-app-kit/core": "9.9.0",
-<<<<<<< HEAD
         "@iot-app-kit/core-util": "9.9.0",
-=======
-        "@iot-app-kit/core-util": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@synchro-charts/core": "7.2.0",
         "dataloader": "^2.2.2",
         "lodash.isequal": "^4.5.0",
@@ -63806,35 +63770,6 @@
         "@aws-sdk/client-iot-events": "3.354.0",
         "@aws-sdk/client-iotsitewise": "3.456.0",
         "@iot-app-kit/core": "9.9.0"
-<<<<<<< HEAD
-=======
-      }
-    },
-    "packages/testing-util/node_modules/@iot-app-kit/core": {
-      "version": "9.9.0",
-      "resolved": "https://registry.npmjs.org/@iot-app-kit/core/-/core-9.9.0.tgz",
-      "integrity": "sha512-fvL2oQCKBbEJYnBSFrLRINCuQxbW2HCm9kZKrvMnPr98+nFAe8fOb9gyyLPAnpS1QOfifjQIo/0dTcQIFIDP3w==",
-      "dependencies": {
-        "@aws-sdk/client-iotsitewise": "3.456.0",
-        "d3-array": "^3.2.4",
-        "intervals-fn": "^3.0.3",
-        "parse-duration": "^1.0.3",
-        "redux": "^4.2.1",
-        "rxjs": "^7.8.1",
-        "uuid": "^9.0.0"
-      }
-    },
-    "packages/testing-util/node_modules/uuid": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "bin": {
-        "uuid": "dist/bin/uuid"
->>>>>>> 80966de4 (fix: bump charts core version)
       }
     },
     "packages/tools-iottwinmaker": {
@@ -73148,15 +73083,9 @@
         "@awsui/components-react": "^3.0.0",
         "@awsui/design-tokens": "^3.0.41",
         "@iot-app-kit/core": "9.9.0",
-<<<<<<< HEAD
         "@iot-app-kit/related-table": "9.9.0",
         "@iot-app-kit/source-iotsitewise": "9.9.0",
         "@iot-app-kit/testing-util": "9.9.0",
-=======
-        "@iot-app-kit/related-table": "9.8.0",
-        "@iot-app-kit/source-iotsitewise": "9.8.0",
-        "@iot-app-kit/testing-util": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@rollup/plugin-replace": "^5.0.2",
         "@stencil/core": "^2.7.0",
         "@stencil/router": "^1.0.1",
@@ -73647,13 +73576,8 @@
         "@aws-sdk/client-iotsitewise": "3.456.0",
         "@aws-sdk/types": "^3.310.0",
         "@iot-app-kit/core": "9.9.0",
-<<<<<<< HEAD
         "@iot-app-kit/jest-config": "9.9.0",
         "@iot-app-kit/ts-config": "9.9.0",
-=======
-        "@iot-app-kit/jest-config": "9.8.0",
-        "@iot-app-kit/ts-config": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@types/jest": "^29.4.0",
         "@types/lodash.difference": "4.5.9",
         "jest": "^29.5.0",
@@ -74053,7 +73977,6 @@
         "@aws-sdk/client-iottwinmaker": "3.354.0",
         "@faker-js/faker": "^8.2.0",
         "@iot-app-kit/charts-core": "^2.1.1",
-<<<<<<< HEAD
         "@iot-app-kit/components": "9.9.0",
         "@iot-app-kit/core": "9.9.0",
         "@iot-app-kit/core-util": "9.9.0",
@@ -74062,16 +73985,6 @@
         "@iot-app-kit/source-iotsitewise": "9.9.0",
         "@iot-app-kit/testing-util": "9.9.0",
         "@iot-app-kit/ts-config": "9.9.0",
-=======
-        "@iot-app-kit/components": "9.8.0",
-        "@iot-app-kit/core": "9.9.0",
-        "@iot-app-kit/core-util": "9.8.0",
-        "@iot-app-kit/jest-config": "9.8.0",
-        "@iot-app-kit/react-components": "9.8.0",
-        "@iot-app-kit/source-iotsitewise": "9.8.0",
-        "@iot-app-kit/testing-util": "9.8.0",
-        "@iot-app-kit/ts-config": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@popperjs/core": "^2.11.8",
         "@reduxjs/toolkit": "^1.9.5",
         "@rollup/plugin-commonjs": "^24.1.0",
@@ -75277,7 +75190,6 @@
         "@cloudscape-design/design-tokens": "3.0.15",
         "@iot-app-kit/charts": "^2.1.1",
         "@iot-app-kit/charts-core": "^2.1.1",
-<<<<<<< HEAD
         "@iot-app-kit/components": "9.9.0",
         "@iot-app-kit/core": "9.9.0",
         "@iot-app-kit/core-util": "9.9.0",
@@ -75286,16 +75198,6 @@
         "@iot-app-kit/source-iottwinmaker": "9.9.0",
         "@iot-app-kit/testing-util": "9.9.0",
         "@iot-app-kit/ts-config": "9.9.0",
-=======
-        "@iot-app-kit/components": "9.8.0",
-        "@iot-app-kit/core": "9.9.0",
-        "@iot-app-kit/core-util": "9.8.0",
-        "@iot-app-kit/jest-config": "9.8.0",
-        "@iot-app-kit/source-iotsitewise": "9.8.0",
-        "@iot-app-kit/source-iottwinmaker": "9.8.0",
-        "@iot-app-kit/testing-util": "9.8.0",
-        "@iot-app-kit/ts-config": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@jest/globals": "^29.5.0",
         "@storybook/addon-essentials": "^6.5.16",
         "@storybook/addon-links": "^6.5.16",
@@ -76144,15 +76046,9 @@
         "@fortawesome/free-solid-svg-icons": "^6.4.2",
         "@fortawesome/react-fontawesome": "^0.2.0",
         "@iot-app-kit/core": "9.9.0",
-<<<<<<< HEAD
         "@iot-app-kit/react-components": "9.9.0",
         "@iot-app-kit/related-table": "9.9.0",
         "@iot-app-kit/source-iottwinmaker": "9.9.0",
-=======
-        "@iot-app-kit/react-components": "9.8.0",
-        "@iot-app-kit/related-table": "9.8.0",
-        "@iot-app-kit/source-iottwinmaker": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@matterport/r3f": "0.2.7",
         "@matterport/webcomponent": "0.1.35",
         "@react-spring/three": "^9.7.2",
@@ -76497,17 +76393,10 @@
         "@aws-sdk/client-iotsitewise": "3.456.0",
         "@aws-sdk/types": "^3.310.0",
         "@iot-app-kit/core": "9.9.0",
-<<<<<<< HEAD
         "@iot-app-kit/core-util": "9.9.0",
         "@iot-app-kit/jest-config": "9.9.0",
         "@iot-app-kit/testing-util": "9.9.0",
         "@iot-app-kit/ts-config": "9.9.0",
-=======
-        "@iot-app-kit/core-util": "9.8.0",
-        "@iot-app-kit/jest-config": "9.8.0",
-        "@iot-app-kit/testing-util": "9.8.0",
-        "@iot-app-kit/ts-config": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@synchro-charts/core": "7.2.0",
         "@types/jest": "^29.4.0",
         "@types/lodash.isequal": "^4.5.6",
@@ -76888,13 +76777,8 @@
         "@aws-sdk/types": "^3.310.0",
         "@aws-sdk/url-parser": "3.374.0",
         "@iot-app-kit/core": "9.9.0",
-<<<<<<< HEAD
         "@iot-app-kit/jest-config": "9.9.0",
         "@iot-app-kit/ts-config": "9.9.0",
-=======
-        "@iot-app-kit/jest-config": "9.8.0",
-        "@iot-app-kit/ts-config": "9.8.0",
->>>>>>> 80966de4 (fix: bump charts core version)
         "@tanstack/query-core": "^4.29.15",
         "@types/jest": "^29.4.0",
         "@types/lodash": "^4.14.195",
@@ -77334,30 +77218,6 @@
         "@aws-sdk/client-iot-events": "3.354.0",
         "@aws-sdk/client-iotsitewise": "3.456.0",
         "@iot-app-kit/core": "9.9.0"
-<<<<<<< HEAD
-=======
-      },
-      "dependencies": {
-        "@iot-app-kit/core": {
-          "version": "9.9.0",
-          "resolved": "https://registry.npmjs.org/@iot-app-kit/core/-/core-9.9.0.tgz",
-          "integrity": "sha512-fvL2oQCKBbEJYnBSFrLRINCuQxbW2HCm9kZKrvMnPr98+nFAe8fOb9gyyLPAnpS1QOfifjQIo/0dTcQIFIDP3w==",
-          "requires": {
-            "@aws-sdk/client-iotsitewise": "3.456.0",
-            "d3-array": "^3.2.4",
-            "intervals-fn": "^3.0.3",
-            "parse-duration": "^1.0.3",
-            "redux": "^4.2.1",
-            "rxjs": "^7.8.1",
-            "uuid": "^9.0.0"
-          }
-        },
-        "uuid": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-          "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
-        }
->>>>>>> 80966de4 (fix: bump charts core version)
       }
     },
     "@iot-app-kit/tools-iottwinmaker": {