diff --git a/Html/.log b/Html/.log
index a1272a5..ec662a0 100644
--- a/Html/.log
+++ b/Html/.log
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 (1585) accepted ('127.0.0.1', 53376)
 149.57.180.14,127.0.0.1 - - [14/Oct/2025 19:24:13] "GET / HTTP/1.1" 302 351 0.000697
 149.57.180.14,127.0.0.1 - - [14/Oct/2025 19:24:13] "GET /login HTTP/1.1" 200 1835 0.000743
@@ -3174,3 +3175,5 @@ Received message on route 'dialog': {'data': '你好，很高兴你能参与这
 receive_ase_dialog {'data': '你好，很高兴你能参与这个项目的技术选型。在开始分析前，我们先同步一下基础概念。根据你在课程中学到的，一个有效的‘算法’需要满足哪些基本条件？请试着告诉我你的理解。', 'role': 'assistant'}
 Received message on route 'dialog-hint': {'data': '你好，很高兴你能参与这个项目的技术选型。我们先从基础开始：请你告诉我，一个有效的算法需要满足哪些基本条件？你可以直接在输入框回答，也可以利用画面中央的代码编辑区写下这些条件，方便整理和复习。准备好后，我们会一起计算不同规模下两种方案的运行时间，并做出推荐。你可以先试着写写看！', 'role': 'assistant'}
 Callback error on route 'dialog-hint': AgentNamespace.receive_ase_dialog_hint() takes 0 positional arguments but 4 were given
+=======
+>>>>>>> da9c9dc8afffb2c29cd1e924417b31dee2040112
diff --git a/Html/apps/templates/navbar.html b/Html/apps/templates/navbar.html
index 3591c19..9a5a25b 100644
--- a/Html/apps/templates/navbar.html
+++ b/Html/apps/templates/navbar.html
@@ -94,6 +94,7 @@
         <a href="/">首页</a>
         <a href="/dashboard">课程</a>
         <a href="/grades">成绩</a>
+        
     {% endif %}
 
     <div class="avatar dropdown">
diff --git a/Html/config.ini b/Html/config.ini
index 4ec4054..b119465 100644
--- a/Html/config.ini
+++ b/Html/config.ini
@@ -5,9 +5,9 @@ api_key = sk-aMpnWklN2IbsK44d1kNpy6YOP9bk1pdPJjFeEmbb0a5ytEFf
 model=gpt-4.1-nano
 
 [VSCODE_WEB]
-url = https://hsamooc.com
+url = https://hsamooc.cn
 [CODE_LIKE]
-url = https://hsamooc.com/vsc-like
+url = https://hsamooc.cn/vsc-like
 #http://asengine.net:8282
 [VSCODE_WEB_PATH]
 is_wsl = true
diff --git a/README.md b/README.md
index a3b8ecf..5849c19 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ api_key = sk-aMpnWklN2IbsK44d1kNpy6YOP9bk1pdPJjFeEmbb0a5ytEFf
 model=gpt-4.1-nano
 
 [VSCODE_WEB]
-url = https://hsamooc.cn
+url = https://hsamooc.com
 #http://asengine.net:8282
 [VSCODE_WEB_PATH]
 is_wsl = true