fix(tests): rename ambiguous behave step for three-way merge to avoid duplicate definition

features/steps/three_way_merge_engine_assertions_steps.py

@@ -115,7 +115,7 @@ def step_merge_success(context: Context) -> None:
     )
 
 
-@then("a merge conflict error should be raised")
+@then("a three-way merge conflict error should be raised")
 def step_merge_conflict_error(context: Context) -> None:
     """Verify a merge conflict error was raised."""
     assert context.merge_error is not None, "Expected MergeConflictError to be raised"

features/three_way_merge_engine.feature

@@ -50,7 +50,7 @@ Feature: Three-Way Merge Engine for Subplan Result Integration
     And a subplan result with the same subplan in COMPLETE state
     And an ancestor plan with the subplan in QUEUED state
     When the subplan result is merged into the parent plan with fail_on_conflict=true
-    Then a merge conflict error should be raised
+    Then a three-way merge conflict error should be raised
     And the conflict should be in the subplan_statuses field
 
   @conflict_detection