diff --git a/etl_billiards/README.md b/etl_billiards/README.md
index 3ca55b3..47f35e1 100644
--- a/etl_billiards/README.md
+++ b/etl_billiards/README.md
@@ -191,8 +191,6 @@ pytest --cov=. --cov-report=html
 - `tests/unit/test_parsers.py` – 解析器单元测试
 - `tests/integration/test_database.py` – 数据库集成测试
 
-<<<<<<< HEAD
-=======
 #### 3.3.1 测试模式（ONLINE / OFFLINE）
 
 - `TEST_MODE=ONLINE`（默认）时，测试会模拟实时 API，完整执行 E/T/L。
@@ -221,7 +219,6 @@ python scripts/run_tests.py --preset offline_realdb
 python scripts/run_tests.py --list-presets   # 查看或自定义 scripts/test_presets.py
 ```
 
->>>>>>> main
 ---
 
 ## 4. 项目结构与文件说明
@@ -308,11 +305,8 @@ etl_billiards/
 │   │   ├── __init__.py
 │   │   ├── test_config.py
 │   │   └── test_parsers.py
-<<<<<<< HEAD
-=======
 │   ├── testdata_json/           # 清洗入库用的测试Json文件
 │   │   └── XX.json              
->>>>>>> main
 │   └── integration/             # 集成测试
 │       ├── __init__.py
 │       └── test_database.py
diff --git a/etl_billiards/orchestration/task_registry.py b/etl_billiards/orchestration/task_registry.py
index 0f1293a..a6fcbd4 100644
--- a/etl_billiards/orchestration/task_registry.py
+++ b/etl_billiards/orchestration/task_registry.py
@@ -3,8 +3,6 @@
 from tasks.orders_task import OrdersTask
 from tasks.payments_task import PaymentsTask
 from tasks.members_task import MembersTask
-<<<<<<< HEAD
-=======
 from tasks.products_task import ProductsTask
 from tasks.tables_task import TablesTask
 from tasks.assistants_task import AssistantsTask
@@ -16,7 +14,6 @@ from tasks.topups_task import TopupsTask
 from tasks.table_discount_task import TableDiscountTask
 from tasks.assistant_abolish_task import AssistantAbolishTask
 from tasks.ledger_task import LedgerTask
->>>>>>> main
 
 class TaskRegistry:
     """任务注册和工厂"""
@@ -44,12 +41,6 @@ class TaskRegistry:
 
 # 默认注册表
 default_registry = TaskRegistry()
-<<<<<<< HEAD
-default_registry.register("ORDERS", OrdersTask)
-default_registry.register("PAYMENTS", PaymentsTask)
-default_registry.register("MEMBERS", MembersTask)
-# 可以继续注册其他任务...
-=======
 default_registry.register("PRODUCTS", ProductsTask)
 default_registry.register("TABLES", TablesTask)
 default_registry.register("MEMBERS", MembersTask)
@@ -64,4 +55,3 @@ default_registry.register("TOPUPS", TopupsTask)
 default_registry.register("TABLE_DISCOUNT", TableDiscountTask)
 default_registry.register("ASSISTANT_ABOLISH", AssistantAbolishTask)
 default_registry.register("LEDGER", LedgerTask)
->>>>>>> main
diff --git a/etl_billiards/tasks/tables_task.py b/etl_billiards/tasks/tables_task.py
index 48ec485..acca631 100644
--- a/etl_billiards/tasks/tables_task.py
+++ b/etl_billiards/tasks/tables_task.py
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-class TablesTask(BaseTask):
-    def get_task_code(self) -> str:  # 返回 "TABLES"
-    def execute(self) -> dict:       # 拉取 /Table/GetSiteTables
-    def _parse_table(self, raw: dict) -> dict | None:
-=======
 # -*- coding: utf-8 -*-
 """台桌档案任务"""
 
@@ -89,4 +83,3 @@ class TablesTask(BaseTask):
             ),
             "raw_data": json.dumps(raw, ensure_ascii=False),
         }
->>>>>>> main