diff --git a/src/modules/Elsa.Workflows.Designer/package.json b/src/modules/Elsa.Workflows.Designer/package.json
index b5020f438..f3a8adb43 100644
--- a/src/modules/Elsa.Workflows.Designer/package.json
+++ b/src/modules/Elsa.Workflows.Designer/package.json
@@ -6,11 +6,7 @@
         "build:debug": "cross-env webpack --mode=development --env configuration=Debug"
     },
     "devDependencies": {
-<<<<<<< HEAD
         "@elsa-workflows/elsa-workflows-designer": "^3.0.2-preview.47",
-=======
-        "@elsa-workflows/elsa-workflows-designer": "^3.0.2-preview.46",
->>>>>>> v3
         "copy-webpack-plugin": "^11.0.0",
         "cross-env": "^7.0.3",
         "monaco-editor": "^0.34.1",