diff --git a/librewolf.cfg b/librewolf.cfg
index 1ea0dd3..9536513 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -177,8 +177,12 @@ if (home_directory) {
 // TRACKING PROTECTION
 // -----------------------------------
 
+<<<<<<< HEAD
 lockPref("browser.contentblocking.category", "custom"); // changing to other options is currently broken anyway
 >>>>>>> 55c94dc (reorganized, revisited)
+=======
+defaultPref("browser.contentblocking.category", "custom"); // changing to other options is currently broken anyway
+>>>>>>> 7b8bd35 (unlock content block cat as breaks cookie button)
 lockPref("privacy.trackingprotection.enabled", false);
 lockPref("privacy.trackingprotection.pbmode.enabled", false);
 lockPref("privacy.trackingprotection.socialtracking.enabled", false);