diff --git a/dsLightRag/static/ai.html b/dsLightRag/static/ai.html
index a89aaa34..d0d0bdb7 100644
--- a/dsLightRag/static/ai.html
+++ b/dsLightRag/static/ai.html
@@ -176,12 +176,7 @@
 <body>
 <div class="container">
     <h1>【东师理想】教育大模型</h1>
-<<<<<<< HEAD
     <center><h3><a href="ChangChun.html">体验一、长春市中考报考知识库</a> <br><br><a href="ShiJi.html">体验二、关系图谱生成</a></h3></center>
-=======
-    <center><h3><a href="ChangChun.html">体验一、长春市中考报考知识库</a><br><br><a
-            href="ShiJi.html">体验二、关系图谱生成</a></h3></center>
->>>>>>> a40234c2a8c9d5798bccd9762d14980af43a8054
     <div class="data-area" id="answerArea">
         <div style="color:#666; padding:20px; text-align:center;">
             <p>请在下方输入您的问题，答案将在此处显示</p>
