diff --git a/crates/index-scheduler/src/error.rs b/crates/index-scheduler/src/error.rs
index a0945d8a3..cbedf827d 100644
--- a/crates/index-scheduler/src/error.rs
+++ b/crates/index-scheduler/src/error.rs
@@ -178,10 +178,9 @@ pub enum Error {
 }
 
 impl Error {
-
     #[inline]
     fn index_name(index_name: &str) -> &str {
-        if let Ok(_) = uuid::Uuid::parse_str(index_name) {
+        if uuid::Uuid::parse_str(index_name).is_ok() {
             "[uuid]"
         } else {
             index_name
diff --git a/crates/meili-snap/src/lib.rs b/crates/meili-snap/src/lib.rs
index 17a57c082..30769c7c1 100644
--- a/crates/meili-snap/src/lib.rs
+++ b/crates/meili-snap/src/lib.rs
@@ -33,7 +33,6 @@ pub fn default_snapshot_settings_for_test<'a>(
     let filename = path.file_name().unwrap().to_str().unwrap();
     settings.set_omit_expression(true);
 
-<<<<<<< HEAD
     fn uuid_in_message_redaction(content: Content, _content_path: ContentPath) -> Content {
         match &content {
             Content::String(s) => {
diff --git a/crates/meilisearch/tests/documents/add_documents.rs b/crates/meilisearch/tests/documents/add_documents.rs
index e8ef43b40..efe1bfbf0 100644
--- a/crates/meilisearch/tests/documents/add_documents.rs
+++ b/crates/meilisearch/tests/documents/add_documents.rs
@@ -1,12 +1,12 @@
+use crate::common::encoder::Encoder;
+use crate::common::{default_settings, GetAllDocumentsOptions, Server, Value};
+use crate::json;
 use actix_web::test;
 use meili_snap::{json_string, snapshot};
 use meilisearch::Opt;
 use time::format_description::well_known::Rfc3339;
 use time::OffsetDateTime;
 use uuid::Uuid;
-use crate::common::encoder::Encoder;
-use crate::common::{default_settings, GetAllDocumentsOptions, Server, Value};
-use crate::json;
 
 /// This is the basic usage of our API and every other tests uses the content-type application/json
 #[actix_rt::test]