diff --git a/src/frontend/package.json b/src/frontend/package.json
index 19c79b3ed..d9371f385 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -26,10 +26,7 @@
     "@tailwindcss/line-clamp": "^0.4.4",
     "@types/axios": "^0.14.0",
     "ace-builds": "^1.24.1",
-<<<<<<< HEAD
     "ag-grid-community": "^31.2.1",
-=======
->>>>>>> node-shortcuts-refactor
     "ag-grid-react": "^31.2.1",
     "ansi-to-html": "^0.7.2",
     "axios": "^1.5.0",