Proper merge of upstream

Author: arielsilvestri

src/connections/sources/catalog/libraries/website/javascript/index.md

@@ -493,8 +493,6 @@ An example:
 analytics.load('writekey', { integrations: { All: false, 'Google Analytics': true, 'Segment.io': true } })
 ```
 
-<<<<<<< Updated upstream
-=======
 You can also add an `obfuscate` property to the object taken as a second argument, which will obscure the url from which your integrations and destination actions are loaded. This is helpful for names that are commonly flagged by ad blockers.
 
 An example:
@@ -505,7 +503,6 @@ analytics.load('writekey', { obfuscate: true })
 
 This value is `false` by default.
 
->>>>>>> Stashed changes
 > info ""
 > **Note:** To use this feature, you must be on snippet version 4.1.0 or later. You can get the latest version of the snippet [here](/docs/connections/sources/catalog/libraries/website/javascript/quickstart/#step-2-copy-the-segment-snippet).
 
@@ -517,18 +514,6 @@ onConsentDialogClosed(function(consentedTools){
 })
 ```
 
-#### Bundle Obfuscation
-You can also add an `obfuscate` property to the object in the second parameter, which obscures the URL from which your integrations and destination actions are loaded. This helps prevent words that are flagged by ad blockers to not be detected in your URL, enabling the integration to properly load.
-
-For example:
-
-```js
-analytics.load('writekey', { obfuscate: true })
-```
-
-The `obfuscate` value is `false` by default.
-
-
 ## Retries
 
 When enabled, Analytics.js automatically retries network and server errors. With persistent retries, Analytics.js can: