diff --git a/README.md b/README.md
index a491ecc..dc32d6e 100755
--- a/README.md
+++ b/README.md
@@ -9,10 +9,14 @@ The old configuration (now tagged as `legacy`) should be considered deprecated a
 <<<<<<< HEAD
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> d79e65a (added Win location)
 We encourage users to find **their own setup** and to use our default configuration as something to build on top of. This is now easier thanks to the overrides, just place your own preferences in the proper location, according to your OS and install method:
 - Most distros and macOS -> `~/.librewolf/librewolf.overrides.cfg`
 - Flatpak -> `~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg`
 - Windows -> `%USERPROFILE%\.librewolf\librewolf.overrides.cfg`
+<<<<<<< HEAD
 =======
 The configuration file was revamped and it includes improvements in usability, a more curated and focused selection of privacy settings, as well as the ability to ovveride preferences with an external file.
 =======
@@ -31,6 +35,8 @@ We encourage users to find **their own setup** and to use our default configurat
 =======
 We encourage users to find **their own setup** and to use our default configuration as something to build on top of. This is now easier thanks to the overrides: just place your own preferences in `~/.librewolf/librewolf.overrides.cfg`, or if you are using Flatpak `~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg`.
 >>>>>>> 6dbfa2e (added flatpak location)
+=======
+>>>>>>> d79e65a (added Win location)
 
 ## Useful links
 - FAQ (coming soon): to help you creating your own pref file.