diff --git a/Changelog.md b/Changelog.md
index e48c8c9..72b2fe5 100755
--- a/Changelog.md
+++ b/Changelog.md
@@ -984,7 +984,17 @@ lockPref("services.blocklist.update_enabled", false); // Deprecated
 lockPref("shield.savant.enabled", false); // Deprecated
 defaultPref("gfx.direct2d.disabled", false); // Win-only, default and probably out of scope
 defaultPref("layers.acceleration.disabled", false); // default and probably out of scope
+<<<<<<< HEAD
 >>>>>>> 45bf63e (processed everything up to EOF)
+=======
+lockPref("browser.taskbar.previews.enable", false); // personal pref
+lockPref("browser.taskbar.lists.enabled", false); // personal pref
+lockPref("browser.taskbar.lists.frequent.enabled", false); // personal pref
+lockPref("browser.taskbar.lists.recent.enabled", false); // personal pref
+lockPref("browser.taskbar.lists.tasks.enabled", false); // personal pref
+defaultPref("webgl.force-enabled", true); // out of scope, not worth
+defaultPref("layers.acceleration.force-enabled", true); // out of scope, not worth
+>>>>>>> 5b1fc33 (removed some more)
 ```
 
 #### Unlocked
@@ -1149,9 +1159,6 @@ defaultPref("network.cookie.cookieBehavior", 1);
 >>>>>>> a35eb4b (re-organized and reviewed)
 =======
 
-// could it be replaced by services.settings.security.onecrl.collection ?
-lockPref("services.blocklist.onecrl.collection", "");
-
 // should we consider disabling WebAssembly ?
 //lockPref("javascript.options.wasm", false);
 
diff --git a/librewolf.cfg b/librewolf.cfg
index cce7cfb..573950a 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -1588,8 +1588,6 @@ lockPref("services.sync.tabs.lastSync", "0");
 // WEBGL AND PERFORMANCE
 // --------------------------------
 
-defaultPref("webgl.force-enabled", true);
-defaultPref("layers.acceleration.force-enabled", true);
 lockPref("webgl.enable-webgl2", false);
 lockPref("webgl.disable-fail-if-major-performance-caveat", true);
 
@@ -1874,6 +1872,7 @@ lockPref("captivedetect.canonicalURL", "");
 // WINDOWS
 // --------------------------------
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 lockPref("network.protocol-handler.warn-external-default",true);
 lockPref("network.protocol-handler.external.javascript",false);
@@ -2156,6 +2155,8 @@ lockPref("browser.taskbar.lists.tasks.enabled", false);
 // disable Windows taskbar preview [WINDOWS]
 lockPref("browser.taskbar.previews.enable", false);
 
+=======
+>>>>>>> 5b1fc33 (removed some more)
 // disable links launching Windows Store [WINDOWS]
 lockPref("network.protocol-handler.external.ms-windows-store", false);