Remove many conflicts

Remove some no longer existing options
Remove numerous redundant options gated behind master switches

1 files changed, 3 insertions, 125 deletions

diff --git a/vendor.js b/vendor.js
index 94abff4..8d85b54 100644
--- a/vendor.js
+++ b/vendor.js
@@ -6,8 +6,6 @@ pref("accessibility.force_disabled", 1);  //Conflict
 
 pref("alerts.showFavicons", false);
 
-//pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/%APP%/%VERSION%/");
-pref("app.feedback.baseURL", "");  //Conflict
 //pref("app.normandy.api_url", "https://normandy.cdn.mozilla.net/api/v1");
 pref("app.normandy.api_url", "");  //Conflict
 //pref("app.normandy.enabled", true);
@@ -99,7 +97,8 @@ pref("browser.newtabpage.activity-stream.feeds.systemtick", false);
 pref("browser.newtabpage.activity-stream.feeds.telemetry", false);
 pref("browser.newtabpage.activity-stream.feeds.topsites", false);
 pref("browser.newtabpage.activity-stream.fxaccounts.endpoint", "");
-pref("browser.newtabpage.activity-stream.prerender", false);
+//pref("browser.newtabpage.activity-stream.prerender", true);
+pref("browser.newtabpage.activity-stream.prerender", false);  //Conflict
 pref("browser.newtabpage.activity-stream.section.highlights.includeBookmarks", false);
 pref("browser.newtabpage.activity-stream.section.highlights.includeDownloads", false);
 pref("browser.newtabpage.activity-stream.section.highlights.includePocket", false);
@@ -115,10 +114,6 @@ pref("browser.newtabpage.remote", false);
 pref("browser.pagethumbnails.capturing_disabled", true); //Breaks page thumbnails
 //pref("browser.ping-centre.telemetry", true);
 pref("browser.ping-centre.telemetry", false);  //Conflict
-//pref("browser.ping-centre.production.endpoint", "https://tiles.services.mozilla.com/v3/links/ping-centre");
-pref("browser.ping-centre.production.endpoint", "https://127.0.0.1");  //Conflict
-//pref("browser.ping-centre.staging.endpoint", "https://onyx_tiles.stage.mozaws.net/v3/links/ping-centre");
-pref("browser.ping-centre.staging.endpoint", "https://127.0.0.1");  //Conflict
 pref("browser.policies.testing.disallowEnterprise", true);
 //pref("browser.privatebrowsing.autostart", true);
 pref("browser.privatebrowsing.autostart", false);  //Conflict
@@ -139,35 +134,13 @@ pref("browser.safebrowsing.enabled", false);
 pref("browser.safebrowsing.malware.enabled", false);
 pref("browser.safebrowsing.phishing.enabled", false);
 pref("browser.safebrowsing.provider.mozilla.gethashURL", "");
-//pref("browser.safebrowsing.provider.mozilla.lists", "base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,block-flash-digest256,except-flash-digest256,allow-flashallow-digest256,except-flashallow-digest256,block-flashsubdoc-digest256,except-flashsubdoc-digest256,ads-track-digest256,social-track-digest256,analytics-track-digest256,base-fingerprinting-track-digest256,content-fingerprinting-track-digest256,base-cryptomining-track-digest256,content-cryptomining-track-digest256,fanboyannoyance-ads-digest256,fanboysocial-ads-digest256,easylist-ads-digest256,easyprivacy-ads-digest256,adguard-ads-digest256");
-pref("browser.safebrowsing.provider.mozilla.lists", "");  //Conflict
 pref("browser.safebrowsing.provider.mozilla.reportURL", "");
 pref("browser.safebrowsing.provider.mozilla.updateURL", "");
 pref("browser.safebrowsing.provider.google.gethashURL", "");
-//pref("browser.safebrowsing.provider.google.lists", "goog-badbinurl-shavar,goog-downloadwhite-digest256,goog-phish-shavar,googpub-phish-shavar,goog-malware-shavar,goog-unwanted-shavar");
-pref("browser.safebrowsing.provider.google.lists", "");  //Conflict
-//pref("browser.safebrowsing.provider.google.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
-pref("browser.safebrowsing.provider.google.reportURL", "");  //Conflict
 pref("browser.safebrowsing.provider.google.updateURL", "");
-//pref("browser.safebrowsing.provider.google.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url=");
-pref("browser.safebrowsing.provider.google.reportMalwareMistakeURL", "");  //Conflict
-//pref("browser.safebrowsing.provider.google.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url=");
-pref("browser.safebrowsing.provider.google.reportPhishMistakeURL", "");  //Conflict
 pref("browser.safebrowsing.provider.google4.dataSharing.enabled", false);
-//pref("browser.safebrowsing.provider.google4.dataSharingURL", "https://safebrowsing.googleapis.com/v4/threatHits?$ct=application/x-protobuf&key=%GOOGLE_API_KEY%&$httpMethod=POST");
-pref("browser.safebrowsing.provider.google4.dataSharingURL", "");  //Conflict
 pref("browser.safebrowsing.provider.google4.gethashURL", "");
-//pref("browser.safebrowsing.provider.google4.lists", "goog-badbinurl-proto,goog-downloadwhite-proto,goog-phish-proto,googpub-phish-proto,goog-malware-proto,goog-unwanted-proto,goog-harmful-proto,goog-passwordwhite-proto");
-pref("browser.safebrowsing.provider.google4.lists", "");  //Conflict
-//pref("browser.safebrowsing.provider.google4.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=
-pref("browser.safebrowsing.provider.google4.reportURL", "");  //Conflict
-//pref("browser.safebrowsing.provider.google4.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url=");
-pref("browser.safebrowsing.provider.google4.reportMalwareMistakeURL", "");  //Conflict
-//pref("browser.safebrowsing.provider.google4.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url=");
-pref("browser.safebrowsing.provider.google4.reportPhishMistakeURL", "");  //Conflict
 pref("browser.safebrowsing.provider.google4.updateURL", "");
-//pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%&url=");
-pref("browser.safebrowsing.reportPhishURL", "");  //Conflict
 pref("browser.search.defaultenginename", "data:text/plain,browser.search.defaultenginename=DuckDuckGo");
 pref("browser.search.geoSpecificDefaults", false);
 //pref("browser.search.geoSpecificDefaults.url", "https://search.services.mozilla.com/1/%APP%/%VERSION%/%CHANNEL%/%LOCALE%/%REGION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%");
@@ -217,7 +190,6 @@ pref("browser.uitour.enabled", false);  //Conflict
 pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
 //pref("browser.urlbar.decodeURLsOnCopy", false);
 pref("browser.urlbar.decodeURLsOnCopy", true);  //Conflict
-pref("browser.urlbar.filter.javascript", true);
 //pref("browser.urlbar.oneOffSearches", true);
 pref("browser.urlbar.oneOffSearches", false);  //Conflict
 pref("browser.urlbar.searchSuggestionsChoice", false);
@@ -263,8 +235,6 @@ pref("devtools.webide.autoinstallADBExtension", false);
 pref("devtools.webide.enabled", false);
 
 pref("dom.allow_cut_copy", false);  //Hidden
-//pref("dom.battery.enabled", true);
-pref("dom.battery.enabled", false);  //Conflict
 //pref("dom.caches.enabled", true);
 pref("dom.caches.enabled", false);  //Conflict
 pref("dom.disable_window_showModalDialog", true);
@@ -276,13 +246,10 @@ pref("dom.event.highrestimestamp.enabled", true);  //Removed in 67
 pref("dom.forms.autocomplete.experimental", false);
 pref("dom.forms.datetime", false);
 pref("dom.gamepad.enabled", false);
-//pref("dom.gamepad.extensions.enabled", true);
-pref("dom.gamepad.extensions.enabled", false);  //Conflict
 pref("dom.gamepad.non_standard_events.enabled", false);
 pref("dom.gamepad.test.enabled", false);
 pref("dom.maxHardwareConcurrency", 1);
 pref("dom.keyboardevent.dispatch_during_composition", false);
-pref("dom.imagecapture.enabled", false);
 pref("dom.indexedDB.enabled", true);
 pref("dom.input.dirpicker", false);
 //pref("dom.IntersectionObserver.enabled", true);
@@ -295,44 +262,21 @@ pref("dom.mozTCPSocket.enabled", false);
 pref("dom.performance.enable_timing_logging", false);
 //pref("dom.popup_allowed_events", "change click dblclick mouseup pointerup notificationclick reset submit touchend");
 pref("dom.popup_allowed_events", "click dblclick");  //Conflict
-//pref("dom.popup_maximum", 20);
-pref("dom.popup_maximum", 3);  //Conflict
-//pref("dom.push.connection.enabled", true);
-pref("dom.push.connection.enabled", false);  //Conflict
 pref("dom.push.enabled", false);
 pref("dom.push.serverURL", "");
 pref("dom.push.userAgentID", "");
 pref("dom.securecontext.whitelist_onions", true);
 pref("dom.serviceWorkers.enabled", false);
-pref("dom.storage.enabled", true);
-//pref("dom.storage_access.enabled", false);  //Broken as of 65
-pref("dom.storageManager.enabled", true);
 pref("dom.targetBlankNoOpener.enabled", true);
-//pref("dom.vibrator.enabled", true);
-pref("dom.vibrator.enabled", false);  //Conflict
 pref("dom.vr.enabled", false);
-pref("dom.vr.add-test-devices", 0);
-pref("dom.vr.cardboard.enabled", false);
-//pref("dom.vr.oculus.enabled", true);
-pref("dom.vr.oculus.enabled", false);  //Conflict
-pref("dom.vr.openvr.enabled", false);
-pref("dom.vr.osvr.enabled", false);
-//pref("dom.vr.poseprediction.enabled", true);
-pref("dom.vr.poseprediction.enabled", false);  //Conflict
 pref("dom.w3c_touch_events.enabled", 0);
 pref("dom.webaudio.enabled", false);
-//pref("dom.webnotifications.enabled", true);
-pref("dom.webnotifications.enabled", false);  //Conflict
 pref("dom.webnotifications.requireinteraction.enabled", false);
-//pref("dom.webnotifications.serviceworker.enabled", true);
-pref("dom.webnotifications.serviceworker.enabled", false);  //Conflict
-pref("dom.workers.enabled", false);
 
 //pref("extensions.autoDisableScopes", 0); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox
 pref("extensions.autoDisableScopes", 15); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox  //Conflict
 pref("extensions.blocklist.detailsURL", "https://blocked.cdn.mozilla.net/");
 pref("extensions.blocklist.enabled", true);
-//pref("extensions.blocklist.enabled", false);  //Conflict
 pref("extensions.blocklist.itemURL", "https://blocked.cdn.mozilla.net/%blockID%.html");
 //pref("extensions.blocklist.url", "https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
 pref("extensions.blocklist.url", "https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%APP_ID%/%APP_VERSION%/");  //Conflict
@@ -348,11 +292,7 @@ pref("extensions.formautofill.available", "off");  //Conflict
 pref("extensions.formautofill.creditCards.enabled", false);  //Conflict
 //pref("extensions.formautofill.heuristics.enabled", true);
 pref("extensions.formautofill.heuristics.enabled", false);  //Conflict
-//pref("extensions.geckoProfiler.symbols.url", "http://symbols.mozilla.org/");
-pref("extensions.geckoProfiler.symbols.url", "");  //Conflict
 pref("extensions.getAddons.cache.enabled", false);
-//pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%");
-pref("extensions.getAddons.get.url", "");  //Conflict
 pref("extensions.getAddons.getWithPerformance.url", "");
 pref("extensions.getAddons.recommended.url", "");
 pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
@@ -361,7 +301,6 @@ pref("extensions.getAddons.showPane", false);
 pref("extensions.getAddons.themes.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");  //Conflict
 pref("extensions.hotfix.id", "");
 pref("extensions.langpacks.signatures.required", false);
-//pref("extensions.pendingOperations", false);
 //pref("extensions.pocket.enabled", true);
 pref("extensions.pocket.enabled", false);  //Conflict
 pref("extensions.pocket.oAuthConsumerKey", "");
@@ -379,8 +318,6 @@ pref("extensions.update.background.url", "");  //Conflict
 //pref("extensions.update.enabled", true);
 pref("extensions.update.enabled", false);  //Conflict
 pref("extensions.webcompat-reporter.enabled", false);
-//pref("extensions.webcompat-reporter.newIssueEndpoint", "https://webcompat.com/issues/new");
-pref("extensions.webcompat-reporter.newIssueEndpoint", "");  //Conflict
 pref("extensions.webextensions.restrictedDomains", "");
 //pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
 pref("extensions.webservice.discoverURL", "");  //Conflict
@@ -391,8 +328,6 @@ pref("font.blacklist.underline_offset", "FangSong,Gulim,GulimChe,MingLiU,MingLiU
 //pref("full-screen-api.warning.timeout", 3000);
 pref("full-screen-api.warning.timeout", 0); //Conflict
 
-//pref("general.useragent.vendor", "");
-//pref("general.useragent.vendorSub", "");
 //pref("general.warnOnAboutConfig", true);
 pref("general.warnOnAboutConfig", false);  //Conflict
 
@@ -400,31 +335,17 @@ pref("geo.enabled", false);
 pref("geo.provider.use_gpsd", false);
 pref("geo.wifi.logging.enabled", false);
 pref("geo.wifi.uri", "");
-//pref("geo.wifi.xhr.timeout", 60000);
-pref("geo.wifi.xhr.timeout", 1);  //Conflict
 
 pref("gfx.downloadable_fonts.fallback_delay", -1);
 pref("gfx.font_rendering.graphite.enabled", false);
 pref("gfx.font_rendering.opentype_svg.enabled", false);
 pref("gfx.layerscope.enabled", false);
-pref("gfx.offscreencanvas.enabled", false);
 
-//pref("identity.fxaccounts.auth.uri", "https://api.accounts.firefox.com/v1");
-pref("identity.fxaccounts.auth.uri", "");  //Conflict
 pref("identity.fxaccounts.enabled", false);
-pref("identity.fxaccounts.remote.email.uri", "");
-//pref("identity.fxaccounts.remote.force_auth.uri", "https://accounts.firefox.com/force_auth?service=sync&context=fx_desktop_v3");
-pref("identity.fxaccounts.remote.force_auth.uri", "");  //Conflict
 //pref("identity.mobilepromo.android", "https://www.mozilla.org/firefox/android/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=");
 pref("identity.mobilepromo.android", "https://www.mozilla.org/firefox/android/");  //Conflict
 //pref("identity.mobilepromo.ios", "https://www.mozilla.org/firefox/ios/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=");
-pref("identity.mobilepromo.ios", "");  //Conflict
-//pref("identity.fxaccounts.remote.oauth.uri", "https://oauth.accounts.firefox.com/v1");
-pref("identity.fxaccounts.remote.oauth.uri", "");  //Conflict
-//pref("identity.fxaccounts.remote.profile.uri", "https://profile.accounts.firefox.com/v1");
-pref("identity.fxaccounts.remote.profile.uri", "");  //Conflict
-//pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sync/1.5");
-pref("identity.sync.tokenserver.uri", "");  //Conflict
+pref("identity.mobilepromo.ios", "https://www.mozilla.org/firefox/ios/");  //Conflict
 
 pref("intl.accept_languages", "en-US, en");
 pref("intl.charset.default", "windows-1252");
@@ -435,17 +356,12 @@ pref("javascript.options.asmjs", false);
 pref("javascript.options.baselinejit", false);
 pref("javascript.options.ion", false);
 pref("javascript.options.native_regexp", false);
-pref("javascript.options.shared_memory", false);
 pref("javascript.options.wasm", false);
-//pref("javascript.options.wasm_baselinejit", true);
-pref("javascript.options.wasm_baselinejit", false);  //Conflict
 pref("javascript.use_us_english_locale", true);
 
 //pref("keyword.enabled", true);
 pref("keyword.enabled", false);  //Conflict
 
-//pref("layers.acceleration.disabled", false);
-//pref("layers.acceleration.disabled", true);  //Conflict
 //pref("layers.acceleration.force-enabled", true);
 
 pref("layout.css.font-loading-api.enabled", true);
@@ -467,8 +383,6 @@ pref("media.autoplay.enabled.user-gestures-needed", false);
 pref("media.benchmark.vp9.threshold", 0);
 pref("media.block-autoplay-until-in-foreground", true);
 pref("media.cache_size", 0);
-//pref("media.decoder-doctor.new-issue-endpoint", "https://webcompat.com/issues/new");
-pref("media.decoder-doctor.new-issue-endpoint", "");  //Conflict
 pref("media.eme.enabled", false);
 pref("media.getusermedia.audiocapture.enabled", false);
 pref("media.getusermedia.browser.enabled", false);
@@ -478,12 +392,8 @@ pref("media.getusermedia.screensharing.enabled", false);  //Conflict
 pref("media.gmp-gmpopenh264.autoupdate", false);
 pref("media.gmp-gmpopenh264.enabled", false);
 pref("media.gmp-manager.updateEnabled", false);  //Hidden
-//pref("media.gmp-manager.url", "https://aus5.mozilla.org/update/3/GMP/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
-pref("media.gmp-manager.url", "data:text/plain,");  //Conflict
 pref("media.gmp-manager.url.override", "data:text/plain,");  //Hidden
 pref("media.gmp-provider.enabled", false);
-//pref("media.gmp.trial-create.enabled", true);
-pref("media.gmp.trial-create.enabled", false);  //Conflict
 pref("media.gmp-widevinecdm.autoupdate", false);
 pref("media.gmp-widevinecdm.enabled", false);
 pref("media.gmp-widevinecdm.visible", false);
@@ -531,8 +441,6 @@ pref("network.http.altsvc.oe", false);  //Conflict
 pref("network.http.connection-retry-timeout", 0);
 pref("network.http.keep-alive.timeout", 115);
 pref("network.http.max-persistent-connections-per-proxy", 256);
-//pref("network.http.redirection-limit", 20);
-pref("network.http.redirection-limit", 10);  //Conflict
 pref("network.http.referer.hideOnionSource", true);
 pref("network.http.referer.spoofSource", false);
 //pref("network.http.sendRefererHeader", 0);            //Breaks many sites, use privacy settings addon to quick toggle
@@ -545,14 +453,7 @@ pref("network.http.referer.defaultPolicy.pbmode", 1);  //Conflict
 //pref("network.http.referer.XOriginPolicy", 0);
 //pref("network.http.referer.XOriginPolicy", 2);  //Conflict
 //pref("network.http.referer.XOriginTrimmingPolicy", 0);
-//pref("network.http.spdy.enabled", true);
-pref("network.http.spdy.enabled", false);  //Conflict
-//pref("network.http.spdy.enabled.deps", true);
-pref("network.http.spdy.enabled.deps", false);  //Conflict
-//pref("network.http.spdy.enabled.http2", true);
-pref("network.http.spdy.enabled.http2", false);  //Conflict
 pref("network.http.spdy.allow-push", false);
-pref("network.http.spdy.websockets", false);
 //pref("network.http.speculative-parallel-limit", 6);
 pref("network.http.speculative-parallel-limit", 0);  //Conflict
 //pref("network.IDN_show_punycode", false);
@@ -571,7 +472,6 @@ pref("network.protocol-handler.warn-external.mailto", true);
 pref("network.protocol-handler.warn-external.news", true);
 pref("network.protocol-handler.warn-external.nntp", true);
 pref("network.protocol-handler.warn-external.snews", true);
-pref("network.proxy.autoconfig_url.include_path", false);
 pref("network.proxy.no_proxies_on", "");
 pref("network.proxy.socks", "127.0.0.1");
 pref("network.proxy.socks_port", 9150);
@@ -583,8 +483,6 @@ pref("network.security.ports.banned", "9050,9051,9150,9151");
 pref("network.trr.bootstrapAddress", "");
 pref("network.trr.mode", 0);
 pref("network.trr.uri", "");
-//pref("network.trr.waitforportal", true);
-pref("network.trr.waitforportal", false);  //Conflict
 
 pref("nsITelemetry.canRecordBase", false);
 pref("nsITelemetry.canRecordExtended", false);
@@ -614,10 +512,6 @@ pref("permissions.memory_only", false);  //Conflict
 //pref("places.history.enabled", true);
 pref("places.history.enabled", false);  //Conflict
 
-//pref("plugin.default.state", 1);
-pref("plugin.default.state", 0);  //Conflict
-//pref("plugin.defaultXpi.state", 2);
-pref("plugin.defaultXpi.state", 0);  //Conflict
 pref("plugin.disable", true);
 pref("plugin.expose_full_path", false);
 //pref("plugin.sessionPermissionNow.intervalInMinutes", 60);
@@ -665,8 +559,6 @@ pref("privacy.sanitize.sanitizeOnShutdown", true);  //Conflict
 //pref("privacy.sanitize.timeSpan", 1);
 pref("privacy.sanitize.timeSpan", 0);  //Conflict
 pref("privacy.suppressModifierKeyEvents", true);
-//pref("privacy.trackingprotection.annotate_channels", true);
-pref("privacy.trackingprotection.annotate_channels", false);  //Conflict
 pref("privacy.trackingprotection.enabled", false);
 pref("privacy.trackingprotection.lower_network_priority", false);
 pref("privacy.trackingprotection.pbmode.enabled", false);
@@ -698,8 +590,6 @@ pref("security.family_safety.mode", 0);
 pref("security.insecure_connection_icon.enabled", true);  //Conflict
 //pref("security.insecure_connection_text.enabled", false);
 pref("security.insecure_connection_text.enabled", true);  //Conflict
-pref("security.insecure_field_warning.contextual.enabled", true);
-pref("security.insecure_password.ui.enabled", true);
 pref("security.mixed_content.block_active_content", true);
 //pref("security.mixed_content.block_display_content", false);
 pref("security.mixed_content.block_display_content", true);  //Conflict
@@ -714,8 +604,6 @@ pref("security.pki.sha1_enforcement_level", 1);  //Conflict
 //pref("security.sandbox.content.syscall_whitelist", "0");
 pref("security.sandbox.content.syscall_whitelist", "16");  //Required for alsa  //Conflict
 pref("security.ssl.disable_session_identifiers", true);
-pref("security.ssl.enable_false_start", false);
-pref("security.ssl.enable_ocsp_must_staple", true);
 pref("security.ssl.enable_ocsp_stapling", true);
 pref("security.ssl.errorReporting.automatic", false);
 pref("security.ssl.errorReporting.enabled", false);
@@ -727,22 +615,16 @@ pref("security.ssl.require_safe_negotiation", true);  //Conflict
 pref("security.ssl.treat_unsafe_negotiation_as_broken", true);  //Conflict
 //pref("security.tls.enable_0rtt_data", true);
 pref("security.tls.enable_0rtt_data", false);  //Conflict
-pref("security.tls.version.min", 1);
-pref("security.tls.version.max", 4);
 
-//pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1");
-pref("services.settings.server", "");  //Conflict
 pref("services.sync.engine.addons", false);
 pref("services.sync.engine.prefs", false);
 pref("services.sync.engine.tabs", false);
 pref("services.sync.ui.hidden", true);
 
 pref("signon.autofillForms", false);
-pref("signon.autofillForms.http", false);
 //pref("signon.formlessCapture.enabled", true);
 pref("signon.formlessCapture.enabled", false);  //Conflict
 pref("signon.rememberSignons", false);
-pref("signon.storeWhenAutocompleteOff", true);
 
 pref("spellchecker.dictionary_path", "/usr/share/hunspell");
 
@@ -753,8 +635,6 @@ pref("startup.homepage_welcome_url.additional", "");
 
 //pref("svg.disabled", true);
 pref("svg.disabled", false);  //Conflict //Multiple critical addons now depend on svg support.
-//pref("svg.in-content.enabled", false);
-pref("svg.in-content.enabled", false);  //Conflict
 
 pref("toolkit.coverage.endpoint.base", "");
 pref("toolkit.coverage.opt-out", true);
@@ -785,8 +665,6 @@ pref("ui.use_standins_for_native_colors", true);
 pref("webchannel.allowObject.urlWhitelist", "");  //Conflict
 
 pref("webextensions.storage.sync.enabled", true);
-//pref("webextensions.storage.sync.serverURL", "https://webextensions.settings.services.mozilla.com/v1");
-pref("webextensions.storage.sync.serverURL", "");  //Conflict
 
 //pref("webgl.disabled", false);
 pref("webgl.disabled", true);  //Conflict