diff --git a/package.json b/package.json
index 15d0e778..05e883a2 100644
--- a/package.json
+++ b/package.json
@@ -55,10 +55,7 @@
 		"postcss-import": "15.1.0",
 		"postcss-reporter": "7.0.5",
 		"postcss-url": "10.1.3",
-<<<<<<< HEAD
 		"sst": "rc",
-=======
->>>>>>> upstream/main
 		"tailwindcss": "3.3.5",
 		"typescript": "5.2.2",
 		"typescript-esbuild": "0.3.0",