diff --git a/package.json b/package.json
index fd87c7e..6d6fe72 100644
--- a/package.json
+++ b/package.json
@@ -12,15 +12,10 @@
     "@tweenjs/tween.js": "^18.6.4",
     "@vitejs/plugin-vue": "^4.6.2",
     "axios": "^1.10.0",
-<<<<<<< HEAD
-    "element-plus": "^2.10.3",
-    "pinia": "^3.0.3",
     "three": "^0.150.1",
-=======
     "element-plus": "^2.10.4",
     "pinia": "^3.0.3",
     "pinia-plugin-persistedstate": "^4.4.1",
->>>>>>> pangluotong/feature-20250712103401-抽奖
     "vite": "^4.5.3",
     "vue": "^3.5.17",
     "vue-router": "^4.5.1"
diff --git a/src/main.js b/src/main.js
index 1ef2861..202dcb2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,14 +1,4 @@
 import { createApp } from 'vue'
-<<<<<<< HEAD
-import { createPinia } from 'pinia'
-
-import './style.css'
-import App from './App.vue'
-import router from './router'
-// import { createPinia } from 'pinia'
-
-createApp(App).use(router).use(createPinia()).mount('#app')
-=======
 import { createPinia } from 'pinia';
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
 import App from './App.vue'
@@ -22,4 +12,3 @@ app.use(pinia)
   .use(router)
   .use(ElementPlus)
   .mount('#app');
->>>>>>> pangluotong/feature-20250712103401-抽奖
diff --git a/vite.config.js b/vite.config.js
index a1c1a71..de757b6 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -3,7 +3,6 @@ import vue from '@vitejs/plugin-vue'
 
 // https://vite.dev/config/
 export default defineConfig({
-<<<<<<< HEAD
   plugins: [vue()],
   server: {
     host: '0.0.0.0',
@@ -17,8 +16,4 @@ export default defineConfig({
       }
     }
   }
-=======
-  plugins: [vue(),
-    ],
->>>>>>> pangluotong/feature-20250712103401-抽奖
 })