diff --git a/src/core/centroid.rs b/src/core/centroid.rs
index 639f9ea..67a958f 100644
--- a/src/core/centroid.rs
+++ b/src/core/centroid.rs
@@ -1,9 +1,6 @@
 use crate::core::vector::Vector;
 use serde::{Deserialize, Serialize};
-<<<<<<< Updated upstream
-=======
 use std::sync::Arc;
->>>>>>> Stashed changes
 use uuid::Uuid;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]