diff --git a/src/App.vue b/src/App.vue
index 9e9114e..1c634c2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,6 @@
 import { onMounted, onUnmounted } from 'vue'
 import Navbar from '@/components/Navbar.vue'
 import Footer from '@/components/Footer.vue'
-import MouseTrail from '@/components/MouseTrail.vue'
 
 const handleScroll = () => {
   const nav = document.querySelector('.navbar')
@@ -26,7 +25,6 @@ onUnmounted(() => {
 
 <template>
   <div class="min-h-screen flex flex-col">
-    <MouseTrail />
     <Navbar />
     <main class="flex-1">
       <router-view v-slot="{ Component }">
diff --git a/src/views/Contact.vue b/src/views/Contact.vue
index 7e5d503..50c3a55 100644
--- a/src/views/Contact.vue
+++ b/src/views/Contact.vue
@@ -54,11 +54,7 @@ const contactInfo = [
       class="fixed inset-0 w-full h-full object-cover z-0"
       autoplay loop muted playsinline
     >
-<<<<<<< HEAD
       <source src="/videos/xingkong.mp4" type="video/mp4" />
-=======
-      <source src="/videos/starry-sky.mp4" type="video/mp4" />
->>>>>>> b71fd0336a7a487dac3c305e8fdde42fe63de6f4
     </video>
     <div class="fixed inset-0 bg-black/30 z-0"></div>
     
@@ -107,11 +103,7 @@ const contactInfo = [
       </div>
     </section>
 
-<<<<<<< HEAD
     <section id="consultation" class="py-20 relative z-10">
-=======
-    <section class="py-20 relative z-10">
->>>>>>> b71fd0336a7a487dac3c305e8fdde42fe63de6f4
       <div class="container mx-auto px-4 sm:px-6 lg:px-8">
         <div class="grid lg:grid-cols-2 gap-12">
           <div>