diff --git a/base_move/move_base_hori_line.py b/base_move/move_base_hori_line.py
index 313e0c5..57070a7 100644
--- a/base_move/move_base_hori_line.py
+++ b/base_move/move_base_hori_line.py
@@ -91,17 +91,12 @@ def align_to_horizontal_line(ctrl, msg, observe=False, max_attempts=3):
             info(f"计算旋转角度: {angle_to_rotate:.2f}度", "角度")
             info(f"当前累积旋转: {accumulated_angle:.2f}度", "累积")
         
-<<<<<<< HEAD
         # 使用turn_degree函数执行旋转，增加精度参数
         info(f"旋转角度: {angle_to_rotate:.2f}度", "旋转")
         turn_success = turn_degree(ctrl, msg, angle_to_rotate, absolute=False, precision=True)
         info(f"旋转结果: {turn_success}", "旋转结果")
         
         # 等待稳定
-=======
-        # 执行旋转
-        turn_success = turn_degree(ctrl, msg, angle_to_rotate, absolute=False, precision=True)
->>>>>>> 6b15e9be908cb3e330a29e326449540f312dec4e
         time.sleep(0.3)
         
         # 计算实际旋转角度
diff --git a/task_1/task_1.py b/task_1/task_1.py
index 3618bac..2909714 100644
--- a/task_1/task_1.py
+++ b/task_1/task_1.py
@@ -24,10 +24,10 @@ def run_task_1(ctrl, msg):
     section('任务1：寻找横线并绕行', "启动")
     info('开始执行任务1...', "启动")
  
-    # # TEST better align
-    # aligned = align_to_horizontal_line(ctrl, msg, observe=observe)
-    # print(aligned)
-    # return
+    # TEST better align
+    aligned = align_to_horizontal_line(ctrl, msg, observe=observe)
+    print(aligned)
+    return
 
     # v2
     section('任务1-1：转弯并扫描QR码', "移动")