fix merge conflicts

Author: sbernauer

rust/crd/src/lib.rs

@@ -459,7 +459,6 @@ impl Merge for JvmArgument {
     fn merge(&mut self, defaults: &Self) {
         *self = defaults.clone();
     }
-
 }
 
 impl TrinoConfig {
@@ -501,11 +500,8 @@ impl TrinoConfig {
             query_max_memory: None,
             query_max_memory_per_node: None,
             graceful_shutdown_timeout: Some(graceful_shutdown_timeout),
-<<<<<<< HEAD
             experimental_additional_jvm_arguments: BTreeMap::new(),
-=======
             requested_secret_lifetime: Some(Self::DEFAULT_SECRET_LIFETIME),
->>>>>>> origin/main
         }
     }
 }