Resolve conflicts

Author: Kazantsev Maksim

native/core/src/execution/planner.rs

@@ -70,8 +70,7 @@ use datafusion::{
 };
 use datafusion_comet_spark_expr::{
     create_comet_physical_fun, create_comet_physical_fun_with_eval_mode, BinaryOutputStyle,
-    BloomFilterAgg, BloomFilterMightContain, CsvWriteOptions, EvalMode, SparkHour, SparkMinute,
-    SparkSecond, SumInteger, ToCsv,
+    BloomFilterAgg, BloomFilterMightContain, CsvWriteOptions, EvalMode, SumInteger, ToCsv,
 };
 use iceberg::expr::Bind;
 

native/spark-expr/src/lib.rs

@@ -29,6 +29,7 @@ pub use static_invoke::*;
 mod struct_funcs;
 pub use struct_funcs::{CreateNamedStruct, GetStructField};
 
+mod csv_funcs;
 mod json_funcs;
 pub mod test_common;
 pub mod timezone;