diff --git a/README.md b/README.md
index 7f36f92..a491ecc 100755
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ The configuration file was revamped and it includes improvements in usability, a
 The old configuration (now tagged as `legacy`) should be considered deprecated and it will no longer be maintained.
 <<<<<<< HEAD
 
+<<<<<<< HEAD
 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`
@@ -27,6 +28,9 @@ 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`.
 >>>>>>> c2f6d4e (tweaks)
+=======
+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)
 
 ## Useful links
 - FAQ (coming soon): to help you creating your own pref file.