diff --git a/librewolf.cfg b/librewolf.cfg
index be38396..1298995 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -2191,6 +2191,7 @@ lockPref("default-browser-agent.enabled", false);
 // allow settings to be overriden with a file at `~/.librewolf/librewolf.overrides.cfg`
 // or `~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg` (Flatpak).
 <<<<<<< HEAD
+<<<<<<< HEAD
 let profile_directory;
 if (profile_directory = getenv('USERPROFILE') || getenv('HOME')) {
   pref('autoadmin.global_config_url', `file://${profile_directory}/.librewolf/librewolf.overrides.cfg`);
@@ -2206,5 +2207,11 @@ lockPref("security.family_safety.mode", 0);
 let home_directory = getenv("HOME");
 if (home_directory) {
   pref("autoadmin.global_config_url", `file://${home_directory}/.librewolf/librewolf.overrides.cfg`);
+=======
+// expected to work on both Windows and MacOS
+let profile_directory;
+if (profile_directory = getenv('USERPROFILE') || getenv('HOME')) {
+  pref('autoadmin.global_config_url', `file://${profile_directory}/.librewolf/librewolf.overrides.cfg`);
+>>>>>>> 0f5c3d5 (updated overrides to work with Win)
 }
 >>>>>>> 344e1e8 (moved overrides to bottom)