diff --git a/README.md b/README.md
index fb37613..d0a45ef 100755
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 LibreWolf settings for all platforms.
 
+<<<<<<< HEAD
 <<<<<<< 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 override preferences with an external file.
 The old configuration (now tagged as `legacy`) should be considered deprecated and it will no longer be maintained.
@@ -12,6 +13,9 @@ We encourage users to find **their own setup** and to use our default configurat
 - Windows -> `%USERPROFILE%\.librewolf\librewolf.overrides.cfg`
 =======
 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.
+=======
+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 override preferences with an external file.
+>>>>>>> f8a4623 (tweak)
 The old configuration (now tagged as legacy) should be considered deprecated and it will no longer be maintained.
 
 <<<<<<< HEAD