diff --git a/CHANGELOG.md b/-CHANGELOG.md
similarity index 99%
rename from CHANGELOG.md
rename to -CHANGELOG.md
index 24c5f81efa..9225f95719 100644
--- a/CHANGELOG.md
+++ b/-CHANGELOG.md
@@ -7,12 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+<<<<<<< HEAD
+=======
 - Migrate inference from deprecated `llama_eval`API to `llama_batch` and `llama_decode` by @abetlen in #795
 
 ## [0.2.13]
 
 - Update llama.cpp to 51b2fc11f7f605fff49725a4540e9a6ef7b51b70
 - Fix name 'open' is not defined exception when deleting model by @abetlen in 011b95d7f34cbfc528af75a892757bd9a20838ab
+>>>>>>> dccbac82ebad865a9332bff248b871417cd439a1
 - Fix tokenization of special characters by @antoine-lizee in #850
 
 ## [0.2.12]
diff --git a/tests/test_llama.py b/tests/test_llama.py
index 54f4bd66cb..5290ccc9b7 100644
--- a/tests/test_llama.py
+++ b/tests/test_llama.py
@@ -1,7 +1,8 @@
 import pytest
 import llama_cpp
 
-MODEL = "./vendor/llama.cpp/models/ggml-vocab-llama.gguf"
+# MODEL = "./vendor/llama.cpp/models/ggml-vocab-llama.gguf"
+MODEL = "C:/Users/micro/git/Llama-2-13b-chat-german-GGUF/Llama-2-13b-chat-german-GGUF.q5_K_M.bin"
 
 
 def test_llama_cpp_tokenization():