Fix merge conflicts

Author: sanketkedia

rust/types/src/collection.rs

@@ -161,11 +161,8 @@ impl Default for Collection {
             version_file_path: None,
             root_collection_id: None,
             lineage_file_path: None,
-<<<<<<< HEAD
             updated_at: SystemTime::now(),
-=======
             database_id: DatabaseUuid::new(),
->>>>>>> 1f8bca1d9 ([ENH]: Return database id in get collections call from sysdb)
         }
     }
 }
@@ -265,7 +262,6 @@ impl TryFrom<chroma_proto::Collection> for Collection {
             },
             None => None,
         };
-<<<<<<< HEAD
         // TODO(@codetheweb): this be updated to error with "missing field" once all SysDb deployments are up-to-date
         let updated_at = match proto_collection.updated_at {
             Some(updated_at) => {
@@ -274,10 +270,8 @@ impl TryFrom<chroma_proto::Collection> for Collection {
             }
             None => SystemTime::now(),
         };
-=======
         let database_id = DatabaseUuid::from_str(&proto_collection.database_id)
             .map_err(|_| CollectionConversionError::InvalidUuid)?;
->>>>>>> 1f8bca1d9 ([ENH]: Return database id in get collections call from sysdb)
         Ok(Collection {
             collection_id,
             name: proto_collection.name,
@@ -296,11 +290,8 @@ impl TryFrom<chroma_proto::Collection> for Collection {
                 .root_collection_id
                 .map(|uuid| CollectionUuid(Uuid::try_parse(&uuid).unwrap())),
             lineage_file_path: proto_collection.lineage_file_path,
-<<<<<<< HEAD
             updated_at,
-=======
             database_id,
->>>>>>> 1f8bca1d9 ([ENH]: Return database id in get collections call from sysdb)
         })
     }
 }
@@ -339,11 +330,8 @@ impl TryFrom<Collection> for chroma_proto::Collection {
             version_file_path: value.version_file_path,
             root_collection_id: value.root_collection_id.map(|uuid| uuid.0.to_string()),
             lineage_file_path: value.lineage_file_path,
-<<<<<<< HEAD
             updated_at: Some(value.updated_at.into()),
-=======
             database_id: value.database_id.0.to_string(),
->>>>>>> 1f8bca1d9 ([ENH]: Return database id in get collections call from sysdb)
         })
     }
 }
@@ -392,14 +380,11 @@ mod test {
             version_file_path: Some("version_file_path".to_string()),
             root_collection_id: Some("00000000-0000-0000-0000-000000000000".to_string()),
             lineage_file_path: Some("lineage_file_path".to_string()),
-<<<<<<< HEAD
             updated_at: Some(prost_types::Timestamp {
                 seconds: 1,
                 nanos: 1,
             }),
-=======
             database_id: "00000000-0000-0000-0000-000000000000".to_string(),
->>>>>>> 1f8bca1d9 ([ENH]: Return database id in get collections call from sysdb)
         };
         let converted_collection: Collection = proto_collection.try_into().unwrap();
         assert_eq!(
@@ -426,13 +411,10 @@ mod test {
             converted_collection.lineage_file_path,
             Some("lineage_file_path".to_string())
         );
-<<<<<<< HEAD
         assert_eq!(
             converted_collection.updated_at,
             SystemTime::UNIX_EPOCH + Duration::new(1, 1)
         );
-=======
         assert_eq!(converted_collection.database_id, DatabaseUuid(Uuid::nil()));
->>>>>>> 1f8bca1d9 ([ENH]: Return database id in get collections call from sysdb)
     }
 }