fix: resolve conflicts on rebase

src/ir/distribution.rs

src/ir/expression.rs

src/ir/expression/tests.rs

src/ir/transformation/redistribution.rs

src/ir/transformation/redistribution/tests.rs

...mation/redistribution/full_motion_less_for_sub_query.yaml

...ribution/full_motion_non_segment_outer_for_sub_query.yaml

...ory/ir/transformation/redistribution/local_sub_query.yaml

...r/transformation/redistribution/multiple_sub_queries.yaml

...ormation/redistribution/segment_motion_for_sub_query.yaml