chore: Restore the parts that were overwritten during conflict resolution.

1 changed files with 0 additions and 2 deletions
--- a/api/core/workflow/graph_engine/entities/graph.py
+++ b/api/core/workflow/graph_engine/entities/graph.py
@ -590,8 +590,6 @@ class Graph(BaseModel):
                            start_node_id=node_id,
                            routes_node_ids=routes_node_ids,
                        )
-                        # Exclude conditional branch nodes
-                        and all(edge.run_condition is None for edge in reverse_edge_mapping.get(node_id, []))
                    ):
                        if node_id not in merge_branch_node_ids:
                            merge_branch_node_ids[node_id] = []