diff --git a/Changelog.md b/Changelog.md
index a83e152..42bc6b2 100755
--- a/Changelog.md
+++ b/Changelog.md
@@ -666,6 +666,7 @@ lockPref("extensions.webapi.testing", false); // hidden but default false
 lockPref("canvas.capturestream.enabled", false); // any real benefit?
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 lockPref("network.http.redirection-limit", 10); // small benefit from having it at default 20, and break some payments
 defaultPref("dom.event.clipboardevents.enabled", false); // causes breakage with small benefits, moved to hardened setup
 =======
@@ -673,6 +674,10 @@ defaultPref("dom.event.clipboardevents.enabled", false); // causes breakage with
 =======
 lockPref("network.http.redirection-limit", 10); // small benefit from having it at default 20, and break some payments 
 >>>>>>> 3afb2b3 (removed redirect limt)
+=======
+lockPref("network.http.redirection-limit", 10); // small benefit from having it at default 20, and break some payments
+defaultPref("dom.event.clipboardevents.enabled", false); // causes breakage with small benefits, moved to hardened setup
+>>>>>>> 0f6e184 (moved a pref to hardened setup)
 
 // fxaccounts is disabled in policies
 lockPref("identity.fxaccounts.enabled", false);
@@ -1628,7 +1633,6 @@ defaultPref("pdfjs.enabledCache.state", false);
 defaultPref("alerts.showFavicons", false); // default: false
 defaultPref("security.remote_settings.intermediates.enabled", true);
 defaultPref("dom.battery.enabled", false); // Unlocked as some think it increases fingerprint, they can now disable it
-defaultPref("dom.event.clipboardevents.enabled", false); // Unlocked as known to cause breakage
 defaultPref("extensions.blocklist.enabled", false);
 defaultPref("extensions.blocklist.detailsURL", "");
 defaultPref("extensions.blocklist.itemURL", "");
@@ -1692,9 +1696,11 @@ you probably also want `security.OCSP.require = true`
 
 #### Hardened setup
 ```
-defaultPref("javascript.options.asmjs", false);                                       defaultPref("javascript.options.wasm", false);
-defaultPref("webgl.disabled", true);
-defaultPref("privacy.resistFingerprinting.letterboxing", true);
+defaultPref("javascript.options.asmjs", false); // disable asm.js
+defaultPref("javascript.options.wasm", false); // disable web assembly
+defaultPref("webgl.disabled", true); // disable webgl
+defaultPref("privacy.resistFingerprinting.letterboxing", true); // enable letterboxing
+defaultPref("dom.event.clipboardevents.enabled", false); // disable user triggered clipboard access
 ```
 <<<<<<< HEAD
 >>>>>>> e7a5601 (more good stuff)
diff --git a/librewolf.cfg b/librewolf.cfg
index 1cd4a73..ad225a7 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -677,7 +677,6 @@ defaultPref("dom.serviceWorkers.enabled", false);
 defaultPref("dom.battery.enabled", false);
 lockPref("dom.popup_maximum", 4);
 defaultPref("dom.popup_allowed_events", "click dblclick mousedown pointerdown");
-defaultPref("dom.event.clipboardevents.enabled", false);
 defaultPref("dom.webaudio.enabled", false);
 lockPref("dom.vr.enabled", false);
 lockPref("dom.vibrator.enabled", false);