diff --git a/package.json b/package.json
index 10ebca80..5eb28f97 100644
--- a/package.json
+++ b/package.json
@@ -32,19 +32,11 @@
 		"@playform/build": "0.0.10",
 		"@playform/compress": "0.0.12",
 		"@playform/format": "0.0.5",
-<<<<<<< HEAD
 		"@playform/inline": "0.0.7",
 		"@tailwindcss/aspect-ratio": "0.4.2",
 		"@tailwindcss/forms": "0.5.7",
 		"@tailwindcss/typography": "0.5.13",
 		"astro": "*",
-=======
-		"@playform/inline": "0.0.6",
-		"@tailwindcss/aspect-ratio": "0.4.2",
-		"@tailwindcss/forms": "0.5.7",
-		"@tailwindcss/typography": "0.5.13",
-		"astro": "4.10.1",
->>>>>>> 8726bdd43dee4530322de2e2f36d2a493177981b
 		"astro-capo": "0.0.1",
 		"astrojs-service-worker": "2.0.0",
 		"autoprefixer": "10.4.19",