diff --git a/src/Client/BattlefieldExplorationSystem b/src/Client/BattlefieldExplorationSystem
index 46d38f6f..d0654959 100755
Binary files a/src/Client/BattlefieldExplorationSystem and b/src/Client/BattlefieldExplorationSystem differ
diff --git a/src/Client/src/ui/components/DeviceCard.cpp b/src/Client/src/ui/components/DeviceCard.cpp
index 8f95aaad..3a8a3011 100644
--- a/src/Client/src/ui/components/DeviceCard.cpp
+++ b/src/Client/src/ui/components/DeviceCard.cpp
@@ -8,11 +8,8 @@
 
 #include "ui/components/DeviceCard.h"
 #include "utils/SystemLogger.h"
-<<<<<<< HEAD
 #include "core/database/DatabaseHelper.h"
-=======
 #include "styles/LeftPanelStyleManager.h"
->>>>>>> cfdfc879c736be6524c03273d48cc75ec7c1d523
 
 // Qt GUI头文件
 #include <QMouseEvent>
@@ -411,8 +408,6 @@ void DeviceCard::updateDeviceStatus(DeviceStatus status)
     }
 }
 
-
-
 void DeviceCard::updateLocation(double longitude, double latitude)
 {
     m_deviceInfo.longitude = longitude;
diff --git a/src/Client/src/ui/components/DeviceListPanel.cpp b/src/Client/src/ui/components/DeviceListPanel.cpp
index 58e3566d..2403be87 100644
--- a/src/Client/src/ui/components/DeviceListPanel.cpp
+++ b/src/Client/src/ui/components/DeviceListPanel.cpp
@@ -8,11 +8,8 @@
 
 #include "ui/components/DeviceListPanel.h"
 #include "utils/SystemLogger.h"
-<<<<<<< HEAD
 #include "core/database/DatabaseHelper.h"
-=======
 #include "styles/LeftPanelStyleManager.h"
->>>>>>> cfdfc879c736be6524c03273d48cc75ec7c1d523
 
 // Qt GUI头文件
 #include <QDebug>
diff --git a/src/Client/src/ui/main/MainWindow.cpp b/src/Client/src/ui/main/MainWindow.cpp
index 13dc2adc..cb132824 100644
--- a/src/Client/src/ui/main/MainWindow.cpp
+++ b/src/Client/src/ui/main/MainWindow.cpp
@@ -10,11 +10,8 @@
 #include "build/ui_MainWindow.h"
 #include "ui/dialogs/DeviceDialog.h"
 #include "utils/SystemLogger.h"
-<<<<<<< HEAD
 #include "core/database/DatabaseHelper.h"
-=======
 #include "styles/ModernStyleManager.h"
->>>>>>> cfdfc879c736be6524c03273d48cc75ec7c1d523
 
 // Qt GUI头文件
 #include <QWebEngineView>
@@ -1270,8 +1267,6 @@ void MainWindow::onStopPersonRecognition()
     // TODO: 实现停止人物识别功能
 }
 
-
-
 void MainWindow::onRefreshEnemyStats()
 {
     qDebug() << "Refreshing enemy statistics...";