diff --git a/index.html b/index.html
index 0a5c6af..95e4c4b 100644
--- a/index.html
+++ b/index.html
@@ -161,11 +161,7 @@
 
   <footer class="site-footer">
     <div class="footer-main"><a class="wordmark" href="#top"><img class="wordmark-logo" src="overcooked-white.png" alt="" aria-hidden="true"><span>煮糊了</span><b>OverCooked</b></a><p>让每一个影视服务，都有一套好平台。</p></div>
-<<<<<<< HEAD
     <div class="footer-meta"><span>© 2026 OverCooked Platform Service.</span><div><a href="pricing.html">服务定价</a><a href="mailto:lachong930@gmail.com">商务联系</a><a href="https://overcooked.top">Back to Global Website</a></div></div>
-=======
-    <div class="footer-meta"><span>© 2026 OverCooked Platform Service.</span><div><a href="pricing.html">服务定价</a><a href="mailto:lachong930@gmail.com">商务联系</a></div></div>
->>>>>>> b2bd402fa97ddb5a429b6fd076019f132e6e2db8
   </footer>
   <script src="script.js"></script>
 </body>