diff --git a/Server/application/command.php b/Server/application/command.php
index 10f9c262..7d742436 100644
--- a/Server/application/command.php
+++ b/Server/application/command.php
@@ -19,9 +19,7 @@ return [
     'message:friendsList' => 'app\command\MessageFriendsListCommand', // 微信好友消息列表 √ 
     'message:chatroomList' => 'app\command\MessageChatroomListCommand', // 微信群聊消息列表 √
     'department:list' => 'app\command\DepartmentListCommand', // 部门列表 √
-<<<<<<< Updated upstream
     'content:sync' => 'app\command\SyncContentCommand', // 同步内容库 √
-=======
     'groupFriends:list' => 'app\command\GroupFriendsCommand', // 微信群好友列表
->>>>>>> Stashed changes
+
 ];