fix: remove stray merge conflict marker

Author: andygrove

native/spark-expr/src/comet_scalar_funcs.rs

@@ -22,7 +22,6 @@ use crate::math_funcs::modulo_expr::spark_modulo;
 use crate::{
     spark_ceil, spark_decimal_div, spark_decimal_integral_div, spark_floor, spark_isnan,
     spark_lpad, spark_make_decimal, spark_read_side_padding, spark_round, spark_rpad, spark_unhex,
-<<<<<<< HEAD
     spark_unscaled_value, EvalMode, SparkArrayPositionFunc, SparkContains, SparkDateDiff,
     SparkDateTrunc, SparkMakeDate, SparkSizeFunc,
 };