diff --git a/yanzhu-bigscreen/public/index.html b/yanzhu-bigscreen/public/index.html
index 4c8889d0..4d4a691b 100644
--- a/yanzhu-bigscreen/public/index.html
+++ b/yanzhu-bigscreen/public/index.html
@@ -13,17 +13,10 @@
     <link rel="stylesheet" href="css/new.css?v=2024052901" />
 
     <link rel="stylesheet" href="css/sichuanTibet.css?v=2024103201" />
-
-<<<<<<< HEAD
     <script
       type="text/javascript"
       src="https://api.map.baidu.com/api?type=webgl&v=1.0&ak=nDcjhjtaNwnVrKNIDbjibTm6i4u0k0fk"
     ></script>
-=======
-  <script
-    type="text/javascript"
-    src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=nDcjhjtaNwnVrKNIDbjibTm6i4u0k0fk"></script>
->>>>>>> 2f324e08658671aca3fac0cfad1a31289cbd8dc3
     <script src="/cdn/vue/dist/vue.js"></script>
     <script src="/cdn/element-ui/lib/index.js"></script>
     <script src="/cdn/jquery/3.5.1/jquery.min.js"></script>