diff --git a/librewolf.cfg b/librewolf.cfg
index 035550b..19f052a 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -436,6 +436,7 @@ defaultPref("media.gmp-widevinecdm.visible", false);
 defaultPref("media.gmp-widevinecdm.enabled", false);
 defaultPref("media.gmp-provider.enabled", false);
 <<<<<<< HEAD
+<<<<<<< HEAD
 defaultPref("media.gmp-manager.url", "data:text/plain,"); // had to re-add to prevent connections
 
 <<<<<<< HEAD
@@ -444,6 +445,9 @@ defaultPref("media.gmp-gmpopenh264.enabled", false);
 =======
 defaultPref("media.gmp-manager.url", "data:text/plain,"); had to re-add to prevent connections
 >>>>>>> 814a479 (reviewed DRM, removed ircs hand, moved exp prefs)
+=======
+defaultPref("media.gmp-manager.url", "data:text/plain,"); // had to re-add to prevent connections
+>>>>>>> f733a19 (fixed broken comment)
 
 // ----------------------
 // # WEBRTC