diff --git a/src/data/index.js b/src/data/index.js
index 584c750..3067d93 100644
--- a/src/data/index.js
+++ b/src/data/index.js
@@ -92,13 +92,9 @@ export const data = [
         result: 0,
       },
     ],
-<<<<<<< HEAD
     tips: [
       `全国最早实行对外开放的`,
       `四个经济特区之一`
     ],
-=======
-    tips: [`全国最早实行对外开放的四个经济特区之一`],
->>>>>>> 5d8a8f95c11f0c188f14ac80980c820e348aa1c2
   },
 ];
diff --git a/vite.config.js b/vite.config.js
index 907331d..3d5e099 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -33,7 +33,7 @@ export default defineConfig(({ command, mode }) => {
             template: 'index.html',
             injectOptions: {
               data: {
-                title: '欢乐闹元宵',
+                title: '打卡理想假期',
               },
             }
           },