diff --git a/package.json b/package.json
index 47d5b06..3c97f83 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,11 @@
 		"files-pipe": "2.0.19"
 	},
 	"devDependencies": {
+<<<<<<< HEAD
 		"typescript-esbuild": "0.2.14"
+=======
+		"typescript-esbuild": "0.2.13"
+>>>>>>> cb26cce1061615217aaafd02294b7dcbf348a338
 	},
 	"publishConfig": {
 		"access": "public"