diff --git a/examples/fdc3-chart-and-grid/js-datagrid/package.json b/examples/fdc3-chart-and-grid/js-datagrid/package.json
index 699faf644..e373e3b32 100644
--- a/examples/fdc3-chart-and-grid/js-datagrid/package.json
+++ b/examples/fdc3-chart-and-grid/js-datagrid/package.json
@@ -38,10 +38,6 @@
     "karma-coverage": "2.2.1",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "2.1.0",
-<<<<<<< HEAD
     "typescript": "5.4.5"
-=======
-    "typescript": "5.3.3"
->>>>>>> bd07522 (chore(deps-dev): bump typescript from 4.9.5 to 5.3.3)
   }
 }