diff --git a/.vscode/settings.json b/.vscode/settings.json
index 20cdf0a7..a6763c99 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,10 +1,4 @@
 {
-<<<<<<< HEAD
-    "cmake.sourceDirectory": "/home/nixmini/Repository/Source/libbitcoin-node/builds/cmake",
-    "cmake.useCMakePresets": "always"
-}
-=======
     "cmake.sourceDirectory": "${workspaceFolder}/builds/cmake",
     "cmake.useCMakePresets": "always"
 }
->>>>>>> e3e1a43d (Regenerate artifacts.)
diff --git a/builds/vscode/node.code-workspace b/builds/vscode/node.code-workspace
index 818f3c0a..7f9d330b 100644
--- a/builds/vscode/node.code-workspace
+++ b/builds/vscode/node.code-workspace
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"folders": [
 		{
 			"path": "../../../libbitcoin-system"
@@ -13,14 +12,6 @@
 		{
 			"path": "../../../libbitcoin-node"
 		}
-	],
-	"settings": {}
-=======
-    "folders": [
-        {
-	    "path": "../../../libbitcoin-node"
-	}
     ],
     "settings": {}
->>>>>>> e3e1a43d (Regenerate artifacts.)
 }