minor conflicts

Author: LiaCastaneda

datafusion/physical-plan/src/joins/hash_join/exec.rs

@@ -4524,7 +4524,7 @@ mod tests {
         )?;
         join.dynamic_filter = Some(HashJoinExecDynamicFilter {
             filter: dynamic_filter,
-            bounds_accumulator: OnceLock::new(),
+            build_accumulator: OnceLock::new(),
         });
 
         // Execute the join
@@ -4572,7 +4572,7 @@ mod tests {
         )?;
         join.dynamic_filter = Some(HashJoinExecDynamicFilter {
             filter: dynamic_filter,
-            bounds_accumulator: OnceLock::new(),
+            build_accumulator: OnceLock::new(),
         });
 
         // Execute the join