diff --git a/package.json b/package.json
index 6997852..a882260 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,11 @@
 		"prepublishOnly": "TypeScriptESBuild 'Source/**/*.ts'"
 	},
 	"devDependencies": {
+<<<<<<< HEAD
 		"astro": "3.0.0",
+=======
+		"astro": "2.10.15",
+>>>>>>> 0ccd22fc7634193b9ece7c4a6cdf589054192a98
 		"typescript-esbuild": "0.1.15"
 	},
 	"publishConfig": {