diff --git a/.vercel/project.json b/.vercel/project.json
index 61bf4ee..67e3e93 100644
--- a/.vercel/project.json
+++ b/.vercel/project.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"projectName":"trae_8qnxf0if"}
-=======
 {"projectName":"trae_zf0uu3bt"}
->>>>>>> milestone-20250723-众筹