fix merge conflicts

Author: sbernauer

rust/operator-binary/src/crd/catalog/mod.rs

@@ -49,7 +49,6 @@ pub mod versioned {
         /// The `connector` defines which connector is used.
         pub connector: TrinoCatalogConnector,
 
-        #[serde(default)]
         /// The `configOverrides` allow overriding arbitrary Trino settings.
         /// For example, for Hive you could add `hive.metastore.username: trino`.
         #[serde(default)]