diff --git a/static/index.html b/static/index.html
index 7e53a9b..76631b8 100644
--- a/static/index.html
+++ b/static/index.html
@@ -220,6 +220,7 @@
                                         <span id="error-percent">0%</span>
                                     </span>
                                 </div>
+<<<<<<< HEAD
                             </div>
                         </div>
                         
@@ -304,6 +305,8 @@
                                         <span id="cpu-status">正常</span>
                                     </span>
                                 </div>
+=======
+>>>>>>> 722961ac936e7162e20fb4cad87e4efae81119f3
                             </div>
                         </div>
                     </div>
diff --git a/static/js/dashboard.js b/static/js/dashboard.js
index 8b1cad9..5e3a878 100644
--- a/static/js/dashboard.js
+++ b/static/js/dashboard.js
@@ -64,6 +64,7 @@ async function loadDashboardData() {
             allowedQueries = stats.allowedQueries || 0;
         }
         
+<<<<<<< HEAD
         // 更新新卡片数据
         if (document.getElementById('avg-response-time')) {
             document.getElementById('avg-response-time').textContent = formatNumber(stats.avgResponseTime || 0) + 'ms';
@@ -100,6 +101,8 @@ async function loadDashboardData() {
             }
         }
         
+=======
+>>>>>>> 722961ac936e7162e20fb4cad87e4efae81119f3
         // 更新表格
         updateTopBlockedTable(topBlockedDomains);
         updateRecentBlockedTable(recentBlockedDomains);