diff --git a/package.json b/package.json
index 457e108..70b3148 100644
--- a/package.json
+++ b/package.json
@@ -36,11 +36,7 @@
 		"files-pipe": "2.1.16"
 	},
 	"devDependencies": {
-<<<<<<< HEAD
 		"typescript-document": "0.0.7",
-=======
-		"typescript-document": "0.0.6",
->>>>>>> 92f163970f587ec9fd81d4e333cdde9f214f7a5e
 		"typescript-esbuild": "0.4.9"
 	},
 	"publishConfig": {