diff --git a/Changelog.md b/Changelog.md
index 530e6a4..6530d64 100755
--- a/Changelog.md
+++ b/Changelog.md
@@ -1049,7 +1049,18 @@ defaultPref("network.http.referer.defaultPolicy.pbmode", 2);  // default
 >>>>>>> 7732277 (imrpoved referers and language settings)
 =======
 defaultPref("layout.spellcheckDefault", 2); // why?
+<<<<<<< HEAD
 >>>>>>> 269747e (fixed lang fp, relaxed xorigin)
+=======
+lockPref("privacy.trackingprotection.introURL", ""); // Deprecated
+defaultPref("general.appname.override", "Netscape"); // no benefit over RFP
+defaultPref("general.appversion.override", "5.0 (Windows)"); // no benefit over RFP, and it doesn't spoof
+defaultPref("general.platform.override", "Win32"); // no benefit over RFP, and it doesn't spoof
+defaultPref("general.oscpu.override", "Windows NT 6.1"); // no benefit over RFP, and it doesn't spoof
+lockPref("general.buildID.override", "20100101"); // no benefit over RFP
+lockPref("browser.startup.homepage_override.buildID", "20100101"); // no benefit over RFP
+defaultPref("general.useragent.override", "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0"); // no benefit over RFP and without may increase FP
+>>>>>>> 934010b (removed overrides for spoofing)
 ```
 
 #### Unlocked
diff --git a/librewolf.cfg b/librewolf.cfg
index 1298995..2ae39f6 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -231,7 +231,6 @@ lockPref("browser.contentblocking.database.enabled", false);
 
 // remove urls
 lockPref("browser.contentblocking.reportBreakage.url", "");
-lockPref("privacy.trackingprotection.introURL", "");
 
 // hide ui elements
 lockPref("browser.contentblocking.cfr-milestone.enabled", false);
@@ -703,6 +702,7 @@ defaultPref("intl.locale.requested", "en-US");
 defaultPref("privacy.spoof_english", 2);
 defaultPref("intl.regional_prefs.use_os_locales", false);
 
+<<<<<<< HEAD
 // --------------------------------------
 // USER AGENT AND IDENTITY
 // --------------------------------------
@@ -833,6 +833,8 @@ defaultPref("extensions.webextensions.restrictedDomains", ""); // This will allo
 lockPref("extensions.webextensions.identity.redirectDomain", ""); // Redirect basedomain used by identity api, default "extensions.allizom.org"
 
 =======
+=======
+>>>>>>> 934010b (removed overrides for spoofing)
 // -------------------------------------------------------
 // EXTENSIONS - check readme section "Extensions Firewall"
 // -------------------------------------------------------