diff --git a/README.md b/README.md
index 6c08452..5881c9e 100644
--- a/README.md
+++ b/README.md
@@ -23,11 +23,6 @@ Navidrome is an open source web-based music collection server and streamer. It g
 
 ## Configuration
 
-<<<<<<< Updated upstream
-You can configure Navidrome by editing this file `/var/lib/navidrome/navidrome.toml` using the [documentation](https://www.navidrome.org/docs/usage/configuration-options/).
-
-The music is to be stored in the folder `/home/yunohost.navidrome/Music`.
-=======
 #### Where are stored your music files
 
 Your music files are stored in your shared [multimedia folder](https://github.com/YunoHost-Apps/yunohost.multimedia) `/home/yunohost.multimedia/share/Music`. This folder is accessible from Nextcloud with *External Storages* enabled. This will allow you to easily upload your music files to the server.
diff --git a/conf/navidrome.toml b/conf/navidrome.toml
index 9db3dfb..bfa9afe 100644
--- a/conf/navidrome.toml
+++ b/conf/navidrome.toml
@@ -5,9 +5,6 @@ BaseURL = "__PATH_URL__"
 ScanInterval = "90s"
 TranscodingCacheSize = "150MiB"
 DataFolder = "__CONFIG_PATH__"
-<<<<<<< Updated upstream
-MusicFolder = "/home/yunohost.navidrome/Music"
-=======
 # Folder where your music library is stored. Can be read-only
 MusicFolder = "/home/yunohost.multimedia/share/Music"
 # How long Navidrome will wait before closing web ui idle sessions
@@ -22,4 +19,3 @@ SearchFullString = "false"
 IgnoredArticles = "The El La Los Las Le Les Os As O A"
 # Enable/disable .m3u playlist auto-import
 AutoImportPlaylists = "true"
->>>>>>> Stashed changes