diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index d767f6beed..7912bf3169 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -72,13 +72,9 @@
             "dist/credentials/TypeformApi.credentials.js",
             "dist/credentials/MandrillApi.credentials.js",
             "dist/credentials/TodoistApi.credentials.js",
-<<<<<<< HEAD
-			"dist/credentials/TypeformApi.credentials.js",
-			"dist/credentials/TogglApi.credentials.js"
-=======
             "dist/credentials/TypeformApi.credentials.js",
+            "dist/credentials/TogglApi.credentials.js",
             "dist/credentials/VeroApi.credentials.js"
->>>>>>> master
         ],
         "nodes": [
             "dist/nodes/ActiveCampaign/ActiveCampaign.node.js",