diff --git a/package.json b/package.json
index 78a25510..0f109864 100644
--- a/package.json
+++ b/package.json
@@ -33,11 +33,7 @@
 		"prepublishOnly": "node --no-warnings --loader ts-node/esm Source/Class/TypeScriptESBuild.ts 'Source/**/*.ts'"
 	},
 	"dependencies": {
-<<<<<<< HEAD
-		"@types/node": "20.10.1",
-=======
 		"@types/node": "20.10.2",
->>>>>>> 00d2ef8ffdb6889daeb4f853cd78887bc6fa1158
 		"commander": "11.1.0",
 		"deepmerge-ts": "5.1.0",
 		"esbuild": "0.19.8",