diff --git a/lib/localisation/Cargo.toml b/lib/localisation/Cargo.toml
index 23c00c5..d9f2753 100644
--- a/lib/localisation/Cargo.toml
+++ b/lib/localisation/Cargo.toml
@@ -4,8 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-<<<<<<< HEAD
 nalgebra = "0.33.0"
-=======
-nalgebra = "0.33.0"
->>>>>>> main