diff --git a/package.json b/package.json
index de8934f..a75405d 100644
--- a/package.json
+++ b/package.json
@@ -21,11 +21,7 @@
 	"devDependencies": {
 		"@cloudflare/workers-types": "4.20240222.0",
 		"typescript-esbuild": "0.3.10",
-<<<<<<< HEAD
-		"wrangler": "3.30.0"
-=======
 		"wrangler": "3.30.1"
->>>>>>> 6505d90fdea24c7d55ec6ae1f56464a88a2aa94a
 	},
 	"publishConfig": {
 		"access": "public"