diff --git a/modelscope/utils/audio/audio_utils.py b/modelscope/utils/audio/audio_utils.py
index 9ece8ca6..5b53bf6c 100644
--- a/modelscope/utils/audio/audio_utils.py
+++ b/modelscope/utils/audio/audio_utils.py
@@ -333,11 +333,7 @@ def update_local_model(model_config, model_path, extra_args):
             model_revision = extra_args['update_model']
     if model_config.__contains__('model'):
         model_name = model_config['model']
-<<<<<<< HEAD
         dst_dir_root = get_model_cache_root()
-=======
-        dst_dir_root = get_model_cache_dir()
->>>>>>> 93218573 (fix #845)
         if isinstance(model_path, str) and os.path.exists(
                 model_path) and not model_path.startswith(dst_dir_root):
             try:
diff --git a/modelscope/utils/config_ds.py b/modelscope/utils/config_ds.py
index face99b4..72a25887 100644
--- a/modelscope/utils/config_ds.py
+++ b/modelscope/utils/config_ds.py
@@ -5,17 +5,9 @@ from pathlib import Path
 
 # Cache location
 from modelscope.hub.constants import DEFAULT_MODELSCOPE_DATA_ENDPOINT
-<<<<<<< HEAD
 from modelscope.utils.file_utils import get_modelscope_cache_dir
 
 MS_CACHE_HOME = get_modelscope_cache_dir()
-=======
-from modelscope.utils.file_utils import get_default_modelscope_cache_dir
-
-DEFAULT_MS_CACHE_HOME = get_default_modelscope_cache_dir()
-MS_CACHE_HOME = os.path.expanduser(
-    os.getenv('MODELSCOPE_CACHE', DEFAULT_MS_CACHE_HOME))
->>>>>>> 93218573 (fix #845)
 
 DEFAULT_MS_DATASETS_CACHE = os.path.join(MS_CACHE_HOME, 'hub', 'datasets')
 MS_DATASETS_CACHE = Path(