diff --git a/core/managers/permission_manager.py b/core/managers/permission_manager.py
index b00d7f6..90bcdb3 100644
--- a/core/managers/permission_manager.py
+++ b/core/managers/permission_manager.py
@@ -412,11 +412,7 @@ class PermissionManager(Singleton):
         """
         try:
             # 创建空的权限数据
-<<<<<<< HEAD
             empty_data: Dict[str, Dict] = {"users": {}}
-=======
-            empty_data = {"users": {}}
->>>>>>> 7229017e16735aef7dfc8379e31646b7a382d135
             
             # 原子性写入文件
             temp_file = self.data_file + ".tmp"