Resolve conflicts + Update article

Author: odsantos

4-binary/03-blob/article.md

@@ -2,14 +2,12 @@
 
 `ArrayBuffer` and views are a part of ECMA standard, a part of JavaScript.
 
-In the browser, there are additional higher-level objects, described in [File API](https://www.w3.org/TR/FileAPI/).
+In the browser, there are additional higher-level objects, described in [File API](https://www.w3.org/TR/FileAPI/), in particular `Blob`.
 
 `Blob` consists of an optional string `type` (a MIME-type usually), plus `blobParts` -- a sequence of other `Blob` objects, strings and `BufferSource`.
 
 ![](blob.svg)
 
-Thanks to `type`, we can download/upload blobs, and it naturally becomes `Content-Type` in network requests.
-
 The constructor syntax is:
 
 ```js
@@ -59,13 +57,9 @@ This behavior is similar to JavaScript strings: we can't change a character in a
 
 A Blob can be easily used as an URL for `<a>`, `<img>` or other tags, to show its contents.
 
-<<<<<<< HEAD
-Let's start with a simple example. By clicking on a link you download a dynamically-generated blob with `hello world` contents as a file:
-=======
 Thanks to `type`, we can also download/upload `Blob` objects, and the `type` naturally becomes `Content-Type` in network requests.
 
 Let's start with a simple example. By clicking on a link you download a dynamically-generated `Blob` with `hello world` contents as a file:
->>>>>>> e074a5f825a3d10b0c1e5e82561162f75516d7e3
 
 ```html run
 <!-- download attribute forces the browser to download instead of navigating -->
@@ -78,13 +72,9 @@ link.href = URL.createObjectURL(blob);
 </script>
 ```
 
-We can also create a link dynamically in JavaScript and simulate a click by `link.click()`, then download starts authomatically.
+We can also create a link dynamically in JavaScript and simulate a click by `link.click()`, then download starts automatically.
 
-<<<<<<< HEAD
-Here's the similar "on the fly" blob creation and download code, but without HTML:
-=======
 Here's the similar code that causes user to download the dynamicallly created `Blob`, without any HTML:
->>>>>>> e074a5f825a3d10b0c1e5e82561162f75516d7e3
 
 ```js run
 let link = document.createElement('a');
@@ -99,39 +89,25 @@ link.click();
 URL.revokeObjectURL(link.href);
 ```
 
-<<<<<<< HEAD
-**`URL.createObjectURL` takes a blob and creates an unique URL for it, in the form `blob:<origin>/<uuid>`.**
-=======
 `URL.createObjectURL` takes a `Blob` and creates a unique URL for it, in the form `blob:<origin>/<uuid>`.
->>>>>>> e074a5f825a3d10b0c1e5e82561162f75516d7e3
 
-That's what the generated url looks like:
+That's what the value of `link.href` looks like:
 
 ```
 blob:https://javascript.info/1e67e00e-860d-40a5-89ae-6ab0cbee6273
 ```
 
 For each URL generated by `URL.createObjectURL` the browser stores a URL -> `Blob` mapping internally. So such URLs are short, but allow to access the `Blob`.
 
-<<<<<<< HEAD
-A generated url is only valid while the current document is open. And it allows to reference the blob in `<img>`, `<a>`, any other object that expects an url.
-=======
 A generated URL (and hence the link with it) is only valid within the current document, while it's open. And it allows to reference the `Blob` in `<img>`, `<a>`, basically any other object that expects an url.
->>>>>>> e074a5f825a3d10b0c1e5e82561162f75516d7e3
 
 There's a side-effect though. While there's a mapping for a `Blob`, the `Blob` itself resides in the memory. The browser can't free it.
 
-<<<<<<< HEAD
-The mapping is automatically cleared on document unload, so blobs are freed then. But if an app is long-living, then that doesn't happen soon. So if we create an URL, that blob will hang in memory, even if not needed any more.
-
-**`URL.revokeObjectURL(url)` removes the reference from the internal mapping, thus allowing the blob to be deleted (if there are no other references), and the memory to be freed.**
-=======
 The mapping is automatically cleared on document unload, so `Blob` objects are freed then. But if an app is long-living, then that doesn't happen soon.
 
 **So if we create a URL, that `Blob` will hang in memory, even if not needed any more.**
 
 `URL.revokeObjectURL(url)` removes the reference from the internal mapping, thus allowing the `Blob` to be deleted (if there are no other references), and the memory to be freed.
->>>>>>> e074a5f825a3d10b0c1e5e82561162f75516d7e3
 
 In the last example, we intend the `Blob` to be used only once, for instant downloading, so we call `URL.revokeObjectURL(link.href)` immediately.
 
@@ -257,7 +233,7 @@ While `ArrayBuffer`, `Uint8Array` and other `BufferSource` are "binary data", a
 
 That makes Blobs convenient for upload/download operations, that are so common in the browser.
 
-Methods that perform web-requests, such as [XMLHttpRequest](info:xmlhttprequest), [fetch](info:fetch-basics) and so on, can work with `Blob` natively, as well as with other binary types.
+Methods that perform web-requests, such as [XMLHttpRequest](info:xmlhttprequest), [fetch](info:fetch) and so on, can work with `Blob` natively, as well as with other binary types.
 
 We can easily convert betweeen `Blob` and low-level binary data types: