diff --git a/Changelog.md b/Changelog.md
index 6be563b..c45bf1f 100755
--- a/Changelog.md
+++ b/Changelog.md
@@ -594,6 +594,7 @@ lockPref("dom.reporting.crash.enabled", false); // default
 defaultPref("network.proxy.autoconfig_url.include_path", false); // default
 lockPref("security.tls.version.min", 3); // default
 <<<<<<< HEAD
+<<<<<<< HEAD
 defaultPref("extensions.webextensions.background-delayed-startup", true); //default
 defaultPref("xpinstall.signatures.required", true); // default
 lockPref("app.normandy.dev_mode", false); // default
@@ -1010,14 +1011,25 @@ defaultPref("layers.acceleration.force-enabled", true); // out of scope, not wor
 >>>>>>> 5b1fc33 (removed some more)
 =======
 defaultPref("privacy.spoof_english", 2); // redudant with RFP and javascript.use_us_english_locale
+=======
+>>>>>>> 7732277 (imrpoved referers and language settings)
 defaultPref("extensions.webextensions.background-delayed-startup", true); //default
-lockPref("xpinstall.whitelist.required", true); // default
 defaultPref("xpinstall.signatures.required", true); // default
 lockPref("app.normandy.dev_mode", false); // default
 defaultPref("pdfjs.enableWebGL", false); // default
-// lockPref("browser.cache.offline.enable", false); // apparently increases fingerprinting and redundant with browser.cache.offline.storage.enable
+lockPref("browser.cache.offline.enable", false); // apparently increases fingerprinting and redundant with browser.cache.offline.storage.enable
 lockPref("network.predictor.enable-prefetch", false); // default
+<<<<<<< HEAD
 >>>>>>> 48fecfd (removed redundant stuff)
+=======
+lockPref("intl.regional_prefs.use_os_locales", false); // default
+defaultPref("intl.locale.requested", "en-US"); // conflicting
+defaultPref("privacy.spoof_english", 2); // automatically handled by RFP and other lang prefs
+lockPref("network.http.referer.trimmingPolicy", 0); // default
+lockPref("network.http.referer.spoofSource", false);  // default
+defaultPref("network.http.referer.defaultPolicy", 2);  // default
+defaultPref("network.http.referer.defaultPolicy.pbmode", 2);  // default
+>>>>>>> 7732277 (imrpoved referers and language settings)
 ```
 
 #### Unlocked
@@ -1183,6 +1195,7 @@ defaultPref("network.cookie.cookieBehavior", 1);
 >>>>>>> a35eb4b (re-organized and reviewed)
 =======
 
+<<<<<<< HEAD
 =======
 >>>>>>> 48fecfd (removed redundant stuff)
 // should we consider disabling WebAssembly ?
@@ -1194,18 +1207,17 @@ defaultPref("xpinstall.signatures.required", true);
 // How much should we lock?
 // How much should we care bout URLs?
 
+=======
+>>>>>>> 7732277 (imrpoved referers and language settings)
 Other points:
-// DRM - should we make it even easier? check update connections
+// How much should we lock?
+// DRM - should we make it even easier?
 // COOKIES - now using dFPI
-// TESTING - untouched, except two entries already addressed
-// MISC - check if fxaccounts need their pref
-// SYNC - does it need to exist given that fxaccounts are off?
 // SB - make re-enabling easier, test connections
 
 for arkenfox:
 dom.security.https_only_mode_send_http_background_request  ->  DISCUSS
 dom.storage.next_gen  ->  DISCUSS
-javascript.options.wasm  ->  DISCUSS
 security.pki.crlite_mode  ->  DISCUSS
 security.remote_settings.crlite_filters.enabled  ->  DISCUSS
 ```
diff --git a/librewolf.cfg b/librewolf.cfg
index 40f42a8..d4664aa 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -643,12 +643,8 @@ lockPref("permissions.manager.defaultsUrl", "");
 // REFERERS
 // --------------------------------
 
-defaultPref("network.http.referer.defaultPolicy", 2);
-defaultPref("network.http.referer.defaultPolicy.pbmode", 2);
 lockPref("network.http.referer.XOriginTrimmingPolicy", 2);
 lockPref("network.http.referer.XOriginPolicy", 2);
-lockPref("network.http.referer.spoofSource", false);
-lockPref("network.http.referer.trimmingPolicy", 0); 
 
 // --------------------------------
 // PROXY
@@ -699,8 +695,6 @@ lockPref("browser.startup.blankWindow", false); // breaks RFP windows resizing
 // --------------------------------------
 
 lockPref("javascript.use_us_english_locale", true);
-lockPref("intl.regional_prefs.use_os_locales", false);
-defaultPref("intl.locale.requested", "en-US");
 defaultPref("intl.accept_languages", "en-US, en");
 
 // --------------------------------------
@@ -900,7 +894,11 @@ lockPref("extensions.screenshots.upload-disabled", true);
 lockPref("lightweightThemes.getMoreURL", "");
 defaultPref("extensions.postDownloadThirdPartyPrompt", false);
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
+=======
+lockPref("xpinstall.whitelist.required", true); // default
+>>>>>>> 7732277 (imrpoved referers and language settings)
 
 <<<<<<< HEAD
 // to check