diff --git a/apps/doc-site/package.json b/apps/doc-site/package.json
index 8823e7ec6..fd37d80d2 100644
--- a/apps/doc-site/package.json
+++ b/apps/doc-site/package.json
@@ -37,15 +37,9 @@
     "vite": "^5.4.11"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@iot-app-kit/core": "12.3.0",
     "@iot-app-kit/react-components": "12.3.0",
     "@iot-app-kit/dashboard": "12.3.0",
-=======
-    "@iot-app-kit/core": "12.2.1",
-    "@iot-app-kit/react-components": "12.2.1",
-    "@iot-app-kit/dashboard": "12.2.1",
->>>>>>> 4a4e67c5 (fix: add dashboard package as dependency)
     "msw-storybook-addon": "^2.0.4"
   },
   "msw": {