diff --git a/examples/template/.vscode/c_cpp_properties.json b/examples/template/.vscode/c_cpp_properties.json
index ee34f28551a75e93f6a2e20bb8a9775fa667603f..90f1ef6ed53581710c44ca2680bd41a882e32cde 100644
--- a/examples/template/.vscode/c_cpp_properties.json
+++ b/examples/template/.vscode/c_cpp_properties.json
@@ -4,7 +4,11 @@
             "name": "RISCV32EC",
             "includePath": [
                 "${workspaceFolder}/**",
+<<<<<<< HEAD
                 "${workspaceFolder}../../ch32v003fun",
+=======
+                "${workspaceFolder}/../../ch32v003fun",
+>>>>>>> 4f99049 (fixed paths)
                 "/usr/include/newlib" //why? the configurationProvider ought to find this
             ],
             "defines": [
diff --git a/examples/template/.vscode/launch.json b/examples/template/.vscode/launch.json
index 3ab61df8ecdaf0f1548ea6cee2374afe6238edc2..de280e448f5c7cda1e71cafe273212768eb4ed6c 100644
--- a/examples/template/.vscode/launch.json
+++ b/examples/template/.vscode/launch.json
@@ -18,7 +18,7 @@
 				},
 				{
 					"type": "shell",
-					"command": "${workspaceFolder}/minichlink/minichlink -aG",
+					"command": "${workspaceFolder}/../../minichlink/minichlink -aG",
 					"continueOn": "gdbserver running"
 				},
 			],
@@ -29,7 +29,7 @@
 					"ignoreFailures": true,
 				},
 			],
-			"svdPath": "${workspaceFolder}/misc/CH32V003xx.svd", // extension 'Peripheral Viewer' by mcu-debug (cortex-debug)
+			"svdPath": "${workspaceFolder}/../../misc/CH32V003xx.svd", // extension 'Peripheral Viewer' by mcu-debug (cortex-debug)
 			"miDebuggerPath": "gdb-multiarch",
 			"miDebuggerServerAddress": "localhost:2000",
 			"logging": {