diff --git a/lib/qwen_fun.py b/lib/qwen_fun.py
index 8c8ac19..b6650a8 100644
--- a/lib/qwen_fun.py
+++ b/lib/qwen_fun.py
@@ -416,7 +416,6 @@ def hazard_inspection(
     class_base_mapping = {}
 
     # 遍历每个类别，分别进行 chat
-<<<<<<< HEAD
     print("类别列表:", class_dict["class_list"])
     for class_str in class_dict["class_list"]:
         print(f"当前类别: {class_str}")
@@ -432,16 +431,6 @@ def hazard_inspection(
             # 该类别没有检查规则
             continue
 
-=======
-    for class_str in class_dict["class_list"]:
-        # 检查该类别是否有检查规则
-        if class_str not in all_check_rule_dict["（一）厂房防火分区"].keys():
-            continue
-
-        # 获取该类别的规则
-        class_check_rule = all_check_rule_dict["（一）厂房防火分区"][class_str]
-
->>>>>>> 7562de4 (2 预览图还有点问题)
         # 筛选出该类别的 track_id_list
         class_track_info = []
         for track_id, track_data in class_dict["track_id_list"].items():