diff --git a/fern/docs/pages/manual/reranker.mdx b/fern/docs/pages/manual/reranker.mdx
index 22a62ff4..4b6be3ff 100644
--- a/fern/docs/pages/manual/reranker.mdx
+++ b/fern/docs/pages/manual/reranker.mdx
@@ -2,7 +2,7 @@
 
 PrivateGPT supports the integration with the `Reranker` which has the potential to enhance the performance of the Retrieval-Augmented Generation (RAG) system.
 
-Currently we only support `flagembedding` for as reranker mode, in order to use it, set the `reranker.mode` property in the `settings.yaml` file to `flagembedding`.
+Currently we only support `flagembedding` as reranker mode, in order to use it, set the `reranker.mode` property in the `settings.yaml` file to `flagembedding`.
 
 ```yaml
 reranker:
diff --git a/settings-test.yaml b/settings-test.yaml
index 0e23ec4c..2269272d 100644
--- a/settings-test.yaml
+++ b/settings-test.yaml
@@ -14,13 +14,11 @@ qdrant:
 llm:
   mode: mock
 
-<<<<<<< HEAD
 embedding:
   mode: mock
-=======
+
 reranker:
   enabled: false
->>>>>>> c096818 (fix: tests)
 
 ui:
   enabled: false