From e3b10e61856b0539390f2503913d200f84a13da5 Mon Sep 17 00:00:00 2001
From: Kevin Jones <joneskj55@gmail.com>
Date: Sun, 10 Oct 2021 16:37:38 -0500
Subject: [PATCH 01/25] sort-by-field fix

---
 .../03-closure/9-sort-by-field/_js.view/test.js                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1-js/06-advanced-functions/03-closure/9-sort-by-field/_js.view/test.js b/1-js/06-advanced-functions/03-closure/9-sort-by-field/_js.view/test.js
index e3c335e03..802f28c4d 100644
--- a/1-js/06-advanced-functions/03-closure/9-sort-by-field/_js.view/test.js
+++ b/1-js/06-advanced-functions/03-closure/9-sort-by-field/_js.view/test.js
@@ -23,7 +23,7 @@ describe("byField", function(){
       { name: "John", age: 20, surname: "Johnson"},
     ];
     let ageSortedAnswer = users.sort(byField("age"));
-    assert.deepEqual(ageSortedKey, ageSortedKey);
+    assert.deepEqual(ageSortedKey, ageSortedAnswer);
   });
 
   it("sorts users by surname", function(){

From 91a89eac20095b983f369b5b63e5ab3b49a6f047 Mon Sep 17 00:00:00 2001
From: LexaWin <87317612+LexaWin@users.noreply.github.com>
Date: Mon, 11 Oct 2021 21:32:36 +0300
Subject: [PATCH 02/25] Update article.md

instanceof is only looking for Animal.prototype in the prototype chain, don't Rabbit.prototype
---
 1-js/09-classes/06-instanceof/article.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1-js/09-classes/06-instanceof/article.md b/1-js/09-classes/06-instanceof/article.md
index 630818188..f9db989ca 100644
--- a/1-js/09-classes/06-instanceof/article.md
+++ b/1-js/09-classes/06-instanceof/article.md
@@ -93,7 +93,7 @@ The algorithm of `obj instanceof Class` works roughly as follows:
     alert(rabbit instanceof Animal); // true
     */!*
 
-    // rabbit.__proto__ === Rabbit.prototype
+    // rabbit.__proto__ === Animal.prototype (no match)
     *!*
     // rabbit.__proto__.__proto__ === Animal.prototype (match!)
     */!*

From 4397c7f931ea7e760ebb8e0b90462624e075829c Mon Sep 17 00:00:00 2001
From: Jiapan-Yu <2541771811yjp@gmail.com>
Date: Thu, 21 Oct 2021 16:33:44 +0800
Subject: [PATCH 03/25] not a right comparison

an empty <div> has its parent element's content area width which may not be zero
---
 2-ui/1-document/09-size-and-scroll/article.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/2-ui/1-document/09-size-and-scroll/article.md b/2-ui/1-document/09-size-and-scroll/article.md
index 13e245ebb..b477a2811 100644
--- a/2-ui/1-document/09-size-and-scroll/article.md
+++ b/2-ui/1-document/09-size-and-scroll/article.md
@@ -116,7 +116,7 @@ function isHidden(elem) {
 }
 ```
 
-Please note that such `isHidden` returns `true` for elements that are on-screen, but have zero sizes (like an empty `<div>`).
+Please note that such `isHidden` returns `true` for elements that are on-screen, but have zero sizes.
 ````
 
 ## clientTop/Left

From c20baa70ce015213b3a18441670d6c0ef0e68893 Mon Sep 17 00:00:00 2001
From: MaHdi <mahdihashemiii939@gmail.com>
Date: Thu, 21 Oct 2021 12:53:20 +0330
Subject: [PATCH 04/25] Add missing "!"

---
 1-js/06-advanced-functions/10-bind/article.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/1-js/06-advanced-functions/10-bind/article.md b/1-js/06-advanced-functions/10-bind/article.md
index 3cee4fe83..9d705cdcd 100644
--- a/1-js/06-advanced-functions/10-bind/article.md
+++ b/1-js/06-advanced-functions/10-bind/article.md
@@ -187,8 +187,8 @@ let user = {
 
 let say = user.say.bind(user);
 
-say("Hello"); // Hello, John ("Hello" argument is passed to say)
-say("Bye"); // Bye, John ("Bye" is passed to say)
+say("Hello"); // Hello, John! ("Hello" argument is passed to say)
+say("Bye"); // Bye, John! ("Bye" is passed to say)
 ```
 
 ````smart header="Convenience method: `bindAll`"

From db074cd4c6b4dccf78d2f222ab4ea56adc9901f9 Mon Sep 17 00:00:00 2001
From: Vigu <marcindabkus@gmail.com>
Date: Fri, 22 Oct 2021 06:40:40 +0200
Subject: [PATCH 05/25] Remove redundant word in Possible Mistakes section

---
 2-ui/2-events/01-introduction-browser-events/article.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/2-ui/2-events/01-introduction-browser-events/article.md b/2-ui/2-events/01-introduction-browser-events/article.md
index 19394e49e..f75f6c11f 100644
--- a/2-ui/2-events/01-introduction-browser-events/article.md
+++ b/2-ui/2-events/01-introduction-browser-events/article.md
@@ -160,7 +160,7 @@ button.onclick = sayThanks;
 button.onclick = sayThanks();
 ```
 
-If we add parentheses, then `sayThanks()` becomes is a function call. So the last line actually takes the *result* of the function execution, that is `undefined` (as the function returns nothing), and assigns it to `onclick`. That doesn't work.
+If we add parentheses, then `sayThanks()` becomes a function call. So the last line actually takes the *result* of the function execution, that is `undefined` (as the function returns nothing), and assigns it to `onclick`. That doesn't work.
 
 ...On the other hand, in the markup we do need the parentheses:
 

From e0624c31db20128f851e0da821808c29ebebb7ec Mon Sep 17 00:00:00 2001
From: Nee <20254688+dneey@users.noreply.github.com>
Date: Fri, 22 Oct 2021 18:49:09 +0000
Subject: [PATCH 06/25] Update article.md

---
 1-js/13-modules/01-modules-intro/article.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1-js/13-modules/01-modules-intro/article.md b/1-js/13-modules/01-modules-intro/article.md
index 7dc65a769..6568c06f1 100644
--- a/1-js/13-modules/01-modules-intro/article.md
+++ b/1-js/13-modules/01-modules-intro/article.md
@@ -261,7 +261,7 @@ Compare it to non-module scripts, where `this` is a global object:
 
 There are also several browser-specific differences of scripts with `type="module"` compared to regular ones.
 
-You may want skip this section for now if you're reading for the first time, or if you don't use JavaScript in a browser.
+You may want to skip this section for now if you're reading for the first time, or if you don't use JavaScript in a browser.
 
 ### Module scripts are deferred
 

From 1310d542ff32e3379736bec2b56bc8db88d15863 Mon Sep 17 00:00:00 2001
From: Kenneth Lum <kenneth.kin.lum@gmail.com>
Date: Sat, 23 Oct 2021 15:59:44 -0700
Subject: [PATCH 07/25] fix typo

---
 1-js/11-async/08-async-await/article.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1-js/11-async/08-async-await/article.md b/1-js/11-async/08-async-await/article.md
index de965d48d..48e72a358 100644
--- a/1-js/11-async/08-async-await/article.md
+++ b/1-js/11-async/08-async-await/article.md
@@ -298,7 +298,7 @@ The `async` keyword before a function has two effects:
 
 The `await` keyword before a promise makes JavaScript wait until that promise settles, and then:
 
-1. If it's an error, the exception is generated — same as if `throw error` were called at that very place.
+1. If it's an error, an exception is generated — same as if `throw error` were called at that very place.
 2. Otherwise, it returns the result.
 
 Together they provide a great framework to write asynchronous code that is easy to both read and write.

From 4c2658d60d60e2958d6300830f08419ed5cd6f33 Mon Sep 17 00:00:00 2001
From: Zuhaib Shah <34958019+zaibugemi@users.noreply.github.com>
Date: Sun, 24 Oct 2021 13:26:12 +0500
Subject: [PATCH 08/25] Fixed a grammatical error

---
 1-js/11-async/03-promise-chaining/article.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1-js/11-async/03-promise-chaining/article.md b/1-js/11-async/03-promise-chaining/article.md
index f675d72ec..6da4cb02e 100644
--- a/1-js/11-async/03-promise-chaining/article.md
+++ b/1-js/11-async/03-promise-chaining/article.md
@@ -37,7 +37,7 @@ The idea is that the result is passed through the chain of `.then` handlers.
 Here the flow is:
 1. The initial promise resolves in 1 second `(*)`,
 2. Then the `.then` handler is called `(**)`, which in turn creates a new promise (resolved with `2` value).
-3. The next `then` `(***)` gets the result of the previous one, processes it (doubles) and passes the next handler.
+3. The next `then` `(***)` gets the result of the previous one, processes it (doubles) and passes it to the next handler.
 4. ...and so on.
 
 As the result is passed along the chain of handlers, we can see a sequence of `alert` calls: `1` -> `2` -> `4`.

From 2a5c881911cb9bb69db25da5bfabe5b9c8d64398 Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 25 Oct 2021 22:16:15 +0300
Subject: [PATCH 09/25] minor fixes

---
 1-js/01-getting-started/1-intro/article.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/1-js/01-getting-started/1-intro/article.md b/1-js/01-getting-started/1-intro/article.md
index f8dc45ea6..ff7db2f5c 100644
--- a/1-js/01-getting-started/1-intro/article.md
+++ b/1-js/01-getting-started/1-intro/article.md
@@ -59,7 +59,7 @@ For instance, in-browser JavaScript is able to:
 
 ## What CAN'T in-browser JavaScript do?
 
-JavaScript's abilities in the browser are limited for the sake of the user's safety. The aim is to prevent an evil webpage from accessing private information or harming the user's data.
+JavaScript's abilities in the browser are limited for the sake of a user's safety. The aim is to prevent an evil webpage from accessing private information or harming the user's data.
 
 Examples of such restrictions include:
 
@@ -86,7 +86,7 @@ There are at least *three* great things about JavaScript:
 ```compare
 + Full integration with HTML/CSS.
 + Simple things are done simply.
-+ Support by all major browsers and enabled by default.
++ Supported by all major browsers and enabled by default.
 ```
 JavaScript is the only browser technology that combines these three things.
 
@@ -118,5 +118,5 @@ There are more. Of course, even if we use one of transpiled languages, we should
 ## Summary
 
 - JavaScript was initially created as a browser-only language, but it is now used in many other environments as well.
-- Today, JavaScript has a unique position as the most widely-adopted browser language with full integration in HTML/CSS.
+- Today, JavaScript has a unique position as the most widely-adopted browser language, fully integrated with HTML/CSS.
 - There are many languages that get "transpiled" to JavaScript and provide certain features. It is recommended to take a look at them, at least briefly, after mastering JavaScript.

From 9dc5f3e949fd320121e5bb7f7ce259ed74f3c36d Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 25 Oct 2021 22:24:10 +0300
Subject: [PATCH 10/25] minor fixes

---
 2-ui/5-loading/02-script-async-defer/article.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/2-ui/5-loading/02-script-async-defer/article.md b/2-ui/5-loading/02-script-async-defer/article.md
index 22497e207..f97c000d6 100644
--- a/2-ui/5-loading/02-script-async-defer/article.md
+++ b/2-ui/5-loading/02-script-async-defer/article.md
@@ -133,8 +133,12 @@ Async scripts are great when we integrate an independent third-party script into
 <script async src="https://google-analytics.com/analytics.js"></script>
 ```
 
+```smart header="The `async` attribute is only for external scripts"
+Just like `defer`, the `async` attribute is ignored if the `<script>` tag has no `src`.
+```
+
 ## Dynamic scripts
- 
+
 There's one more important way of adding a script to the page.
 
 We can create a script and append it to the document dynamically using JavaScript:
@@ -188,7 +192,7 @@ But there are also essential differences between them:
 | `async` | *Load-first order*. Their document order doesn't matter -- which loads first runs first |  Irrelevant. May load and execute while the document has not yet been fully downloaded. That happens if scripts are small or cached, and the document is long enough. |
 | `defer` | *Document order* (as they go in the document). |  Execute after the document is loaded and parsed (they wait if needed), right before `DOMContentLoaded`. |
 
-In practice, `defer` is used for scripts that need the whole DOM and/or their relative execution order is important. 
+In practice, `defer` is used for scripts that need the whole DOM and/or their relative execution order is important.
 
 And  `async` is used for independent scripts, like counters or ads. And their relative execution order does not matter.
 

From 91e9b9c237ca10b234630789f1c031ccd6fe300a Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 25 Oct 2021 22:34:12 +0300
Subject: [PATCH 11/25] minor fixes

---
 .../01-onload-ondomcontentloaded/article.md   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/2-ui/5-loading/01-onload-ondomcontentloaded/article.md b/2-ui/5-loading/01-onload-ondomcontentloaded/article.md
index cd9267421..2351a90cd 100644
--- a/2-ui/5-loading/01-onload-ondomcontentloaded/article.md
+++ b/2-ui/5-loading/01-onload-ondomcontentloaded/article.md
@@ -185,6 +185,26 @@ window.onbeforeunload = function() {
 
 The behavior was changed, because some webmasters abused this event handler by showing misleading and annoying messages. So right now old browsers still may show it as a message, but aside of that -- there's no way to customize the message shown to the user.
 
+````warn header="The `event.preventDefault()` doesn't work from a `beforeunload` handler"
+That may sound weird, but most browsers ignore `event.preventDefault()`.
+
+Which means, following code may not work:
+```js run
+window.addEventListener("beforeunload", (event) => {
+  // doesn't work, so this event handler doesn't do anything
+	event.preventDefault();
+});
+```
+
+Instead, in such handlers one should set `event.returnValue` to a string to get the result similar to the code above:
+```js run
+window.addEventListener("beforeunload", (event) => {
+  // same as returning from window.onbeforeunload
+	event.returnValue = "There are unsaved changes. Leave now?";
+});
+```
+````
+
 ## readyState
 
 What happens if we set the `DOMContentLoaded` handler after the document is loaded?

From 6be354d04997c9810beb7fc255fedee3e138edb4 Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 25 Oct 2021 22:35:44 +0300
Subject: [PATCH 12/25] minor fixes

---
 .../7-keyboard-events/keyboard-dump.view/script.js              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/2-ui/3-event-details/7-keyboard-events/keyboard-dump.view/script.js b/2-ui/3-event-details/7-keyboard-events/keyboard-dump.view/script.js
index 5eba24c7a..d97f7a7b5 100644
--- a/2-ui/3-event-details/7-keyboard-events/keyboard-dump.view/script.js
+++ b/2-ui/3-event-details/7-keyboard-events/keyboard-dump.view/script.js
@@ -5,6 +5,8 @@ let lastTime = Date.now();
 function handle(e) {
   if (form.elements[e.type + 'Ignore'].checked) return;
 
+  area.scrollTop = 1e6;
+
   let text = e.type +
     ' key=' + e.key +
     ' code=' + e.code +

From 2ac75262dbf4a36fa2d0ba5925570c6248a32f5e Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 25 Oct 2021 22:36:12 +0300
Subject: [PATCH 13/25] minor fixes

---
 2-ui/5-loading/01-onload-ondomcontentloaded/article.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/2-ui/5-loading/01-onload-ondomcontentloaded/article.md b/2-ui/5-loading/01-onload-ondomcontentloaded/article.md
index 2351a90cd..ac421120a 100644
--- a/2-ui/5-loading/01-onload-ondomcontentloaded/article.md
+++ b/2-ui/5-loading/01-onload-ondomcontentloaded/article.md
@@ -199,7 +199,7 @@ window.addEventListener("beforeunload", (event) => {
 Instead, in such handlers one should set `event.returnValue` to a string to get the result similar to the code above:
 ```js run
 window.addEventListener("beforeunload", (event) => {
-  // same as returning from window.onbeforeunload
+  // works, same as returning from window.onbeforeunload
 	event.returnValue = "There are unsaved changes. Leave now?";
 });
 ```

From 83085378e37deec9084e55d3c978ee2fc334569f Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 25 Oct 2021 23:04:20 +0300
Subject: [PATCH 14/25] closes #2757

---
 2-ui/1-document/05-basic-dom-node-properties/article.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/2-ui/1-document/05-basic-dom-node-properties/article.md b/2-ui/1-document/05-basic-dom-node-properties/article.md
index fc3bf6525..aadf56ca1 100644
--- a/2-ui/1-document/05-basic-dom-node-properties/article.md
+++ b/2-ui/1-document/05-basic-dom-node-properties/article.md
@@ -25,7 +25,9 @@ The classes are:
     - [HTMLInputElement](https://html.spec.whatwg.org/multipage/forms.html#htmlinputelement) -- the class for `<input>` elements,
     - [HTMLBodyElement](https://html.spec.whatwg.org/multipage/semantics.html#htmlbodyelement) -- the class for `<body>` elements,
     - [HTMLAnchorElement](https://html.spec.whatwg.org/multipage/semantics.html#htmlanchorelement) -- the class for `<a>` elements,
-    - ...and so on, each tag has its own class that may provide specific properties and methods.
+    - ...and so on.
+
+There are many other tags with their own classes that may specific properties and methods, while some elements, such as `<span>`, `<section>`, `<article>` do not have any specific properties, so they are instances of `HTMLElement` class.
 
 So, the full set of properties and methods of a given node comes as the result of the inheritance.
 
@@ -128,7 +130,7 @@ For instance:
 
 ```html run
 <body>
-  <script>  
+  <script>
   let elem = document.body;
 
   // let's examine what it is?

From 6989312841d843f2350803ab552d9082437be569 Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 25 Oct 2021 23:06:58 +0300
Subject: [PATCH 15/25] closes #2752

---
 9-regular-expressions/07-regexp-escaping/article.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/9-regular-expressions/07-regexp-escaping/article.md b/9-regular-expressions/07-regexp-escaping/article.md
index 3a4640b49..1ad3ac98c 100644
--- a/9-regular-expressions/07-regexp-escaping/article.md
+++ b/9-regular-expressions/07-regexp-escaping/article.md
@@ -3,9 +3,9 @@
 
 As we've seen, a backslash `pattern:\` is used to denote character classes, e.g. `pattern:\d`. So it's a special character in regexps (just like in regular strings).
 
-There are other special characters as well, that have special meaning in a regexp. They are used to do more powerful searches. Here's a full list of them: `pattern:[ \ ^ $ . | ? * + ( )`.
+There are other special characters as well, that have special meaning in a regexp, such as `pattern:[ ] { } ( ) \ ^ $ . | ? * +`. They are used to do more powerful searches.
 
-Don't try to remember the list -- soon we'll deal with each of them separately and you'll know them by heart automatically.
+Don't try to remember the list -- soon we'll deal with each of them, and you'll know them by heart automatically.
 
 ## Escaping
 

From cc18823108d0d387c7605e36ad5f673bada5dcfb Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 1 Nov 2021 20:57:19 +0300
Subject: [PATCH 16/25] minor fixes

---
 .../02-find-matching-bbtags/solution.md                   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/9-regular-expressions/13-regexp-alternation/02-find-matching-bbtags/solution.md b/9-regular-expressions/13-regexp-alternation/02-find-matching-bbtags/solution.md
index 9b3fa1877..fb6682b6b 100644
--- a/9-regular-expressions/13-regexp-alternation/02-find-matching-bbtags/solution.md
+++ b/9-regular-expressions/13-regexp-alternation/02-find-matching-bbtags/solution.md
@@ -1,14 +1,14 @@
 
-Opening tag is `pattern:\[(b|url|quote)\]`.
+Opening tag is `pattern:\[(b|url|quote)]`.
 
 Then to find everything till the closing tag -- let's use the pattern `pattern:.*?` with flag `pattern:s` to match any character including the newline and then add a backreference to the closing tag.
 
-The full pattern: `pattern:\[(b|url|quote)\].*?\[/\1\]`.
+The full pattern: `pattern:\[(b|url|quote)\].*?\[/\1]`.
 
 In action:
 
 ```js run
-let regexp = /\[(b|url|quote)\].*?\[\/\1\]/gs;
+let regexp = /\[(b|url|quote)].*?\[\/\1]/gs;
 
 let str = `
   [b]hello![/b]
@@ -20,4 +20,4 @@ let str = `
 alert( str.match(regexp) ); // [b]hello![/b],[quote][url]http://google.com[/url][/quote]
 ```
 
-Please note that besides escaping `pattern:[` and `pattern:]`, we had to escape a slash for the closing tag `pattern:[\/\1]`, because normally the slash closes the pattern.
+Please note that besides escaping `pattern:[`, we had to escape a slash for the closing tag `pattern:[\/\1]`, because normally the slash closes the pattern.

From be69f349d0abf1d3971a4330a66e72565cb3a1d1 Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 1 Nov 2021 21:18:23 +0300
Subject: [PATCH 17/25] minor fixes

---
 9-regular-expressions/05-regexp-multiline-mode/article.md | 8 ++++----
 .../11-regexp-groups/01-test-mac/solution.md              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/9-regular-expressions/05-regexp-multiline-mode/article.md b/9-regular-expressions/05-regexp-multiline-mode/article.md
index 1c8b36d0a..5d4c48bf4 100644
--- a/9-regular-expressions/05-regexp-multiline-mode/article.md
+++ b/9-regular-expressions/05-regexp-multiline-mode/article.md
@@ -16,7 +16,7 @@ let str = `1st place: Winnie
 3rd place: Eeyore`;
 
 *!*
-alert( str.match(/^\d/gm) ); // 1, 2, 3
+console.log( str.match(/^\d/gm) ); // 1, 2, 3
 */!*
 ```
 
@@ -28,7 +28,7 @@ let str = `1st place: Winnie
 3rd place: Eeyore`;
 
 *!*
-alert( str.match(/^\d/g) ); // 1
+console.log( str.match(/^\d/g) ); // 1
 */!*
 ```
 
@@ -51,7 +51,7 @@ let str = `Winnie: 1
 Piglet: 2
 Eeyore: 3`;
 
-alert( str.match(/\d$/gm) ); // 1,2,3
+console.log( str.match(/\d$/gm) ); // 1,2,3
 ```
 
 Without the flag `pattern:m`, the dollar `pattern:$` would only match the end of the whole text, so only the very last digit would be found.
@@ -75,7 +75,7 @@ let str = `Winnie: 1
 Piglet: 2
 Eeyore: 3`;
 
-alert( str.match(/\d\n/gm) ); // 1\n,2\n
+console.log( str.match(/\d\n/gm) ); // 1\n,2\n
 ```
 
 As we can see, there are 2 matches instead of 3.
diff --git a/9-regular-expressions/11-regexp-groups/01-test-mac/solution.md b/9-regular-expressions/11-regexp-groups/01-test-mac/solution.md
index 26f7888f7..f7a5f1e39 100644
--- a/9-regular-expressions/11-regexp-groups/01-test-mac/solution.md
+++ b/9-regular-expressions/11-regexp-groups/01-test-mac/solution.md
@@ -9,7 +9,7 @@ Now let's show that the match should capture all the text: start at the beginnin
 Finally:
 
 ```js run
-let regexp = /^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}$/i;
+let regexp = /^[0-9a-f]{2}(:[0-9a-f]{2}){5}$/i;
 
 alert( regexp.test('01:32:54:67:89:AB') ); // true
 

From 9fcffe169256894db8c4c57444b264b133b208d9 Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 1 Nov 2021 21:18:36 +0300
Subject: [PATCH 18/25] minor fixes

---
 9-regular-expressions/05-regexp-multiline-mode/article.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/9-regular-expressions/05-regexp-multiline-mode/article.md b/9-regular-expressions/05-regexp-multiline-mode/article.md
index 5d4c48bf4..82f4d781d 100644
--- a/9-regular-expressions/05-regexp-multiline-mode/article.md
+++ b/9-regular-expressions/05-regexp-multiline-mode/article.md
@@ -75,7 +75,7 @@ let str = `Winnie: 1
 Piglet: 2
 Eeyore: 3`;
 
-console.log( str.match(/\d\n/gm) ); // 1\n,2\n
+console.log( str.match(/\d\n/g) ); // 1\n,2\n
 ```
 
 As we can see, there are 2 matches instead of 3.

From 15f7acfc2a87a93814a859de33450d32c6d82cbb Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Mon, 1 Nov 2021 23:15:10 +0300
Subject: [PATCH 19/25] minor fixes

---
 1-js/02-first-steps/01-hello-world/article.md               | 2 +-
 .../03-animate-circle-promise/solution.view/index.html      | 2 +-
 .../07-carousel/solution.view/index.html                    | 2 +-
 .../2-hoverintent/solution.view/hoverIntent.js              | 2 +-
 4-binary/01-arraybuffer-binary-arrays/article.md            | 6 +++---
 .../3-animate-circle/solution.view/index.html               | 2 +-
 .../3-animate-circle/source.view/index.html                 | 2 +-
 .../4-animate-circle-callback/solution.view/index.html      | 2 +-
 .../3-js-animation/1-animate-ball/solution.view/index.html  | 2 +-
 .../2-animate-ball-hops/solution.view/index.html            | 2 +-
 7-animation/3-js-animation/article.md                       | 2 +-
 7-animation/3-js-animation/bounce-easeinout.view/index.html | 2 +-
 7-animation/3-js-animation/bounce-easeout.view/index.html   | 2 +-
 7-animation/3-js-animation/bounce.view/index.html           | 2 +-
 7-animation/3-js-animation/text.view/index.html             | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/1-js/02-first-steps/01-hello-world/article.md b/1-js/02-first-steps/01-hello-world/article.md
index fa935f341..35f82bf5d 100644
--- a/1-js/02-first-steps/01-hello-world/article.md
+++ b/1-js/02-first-steps/01-hello-world/article.md
@@ -73,7 +73,7 @@ Script files are attached to HTML with the `src` attribute:
 <script src="/path/to/script.js"></script>
 ```
 
-Here, `/path/to/script.js` is an absolute path to the script from the site root. One can also provide a relative path from the current page. For instance, `src="script.js"` would mean a file `"script.js"` in the current folder.
+Here, `/path/to/script.js` is an absolute path to the script from the site root. One can also provide a relative path from the current page. For instance, `src="script.js"`, just like `src="./script.js"`, would mean a file `"script.js"` in the current folder.
 
 We can give a full URL as well. For instance:
 
diff --git a/1-js/11-async/02-promise-basics/03-animate-circle-promise/solution.view/index.html b/1-js/11-async/02-promise-basics/03-animate-circle-promise/solution.view/index.html
index 3229daf89..6052f009e 100644
--- a/1-js/11-async/02-promise-basics/03-animate-circle-promise/solution.view/index.html
+++ b/1-js/11-async/02-promise-basics/03-animate-circle-promise/solution.view/index.html
@@ -10,7 +10,7 @@
       text-align: center;
     }
     .circle {
-      transition-property: width, height, margin-left, margin-top;
+      transition-property: width, height;
       transition-duration: 2s;
       position: fixed;
       transform: translateX(-50%) translateY(-50%);
diff --git a/2-ui/2-events/01-introduction-browser-events/07-carousel/solution.view/index.html b/2-ui/2-events/01-introduction-browser-events/07-carousel/solution.view/index.html
index 2c6073316..baf867664 100644
--- a/2-ui/2-events/01-introduction-browser-events/07-carousel/solution.view/index.html
+++ b/2-ui/2-events/01-introduction-browser-events/07-carousel/solution.view/index.html
@@ -10,7 +10,7 @@
   <div id="carousel" class="carousel">
     <button class="arrow prev">⇦</button>
     <div class="gallery">
-      <ul class="images">
+      <ul>
         <li><img src="https://en.js.cx/carousel/1.png"></li>
         <li><img src="https://en.js.cx/carousel/2.png"></li>
         <li><img src="https://en.js.cx/carousel/3.png"></li>
diff --git a/2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/2-hoverintent/solution.view/hoverIntent.js b/2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/2-hoverintent/solution.view/hoverIntent.js
index 4e6e2a3e9..7503ca9c2 100644
--- a/2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/2-hoverintent/solution.view/hoverIntent.js
+++ b/2-ui/3-event-details/3-mousemove-mouseover-mouseout-mouseenter-mouseleave/2-hoverintent/solution.view/hoverIntent.js
@@ -88,7 +88,7 @@ class HoverIntent {
     if (speed < this.sensitivity) {
       clearInterval(this.checkSpeedInterval);
       this.isHover = true;
-      this.over.call(this.elem, event);
+      this.over.call(this.elem);
     } else {
       // speed fast, remember new coordinates as the previous ones
       this.prevX = this.lastX;
diff --git a/4-binary/01-arraybuffer-binary-arrays/article.md b/4-binary/01-arraybuffer-binary-arrays/article.md
index accd3c505..95c18dda9 100644
--- a/4-binary/01-arraybuffer-binary-arrays/article.md
+++ b/4-binary/01-arraybuffer-binary-arrays/article.md
@@ -126,9 +126,9 @@ new TypedArray();
 
 We can create a `TypedArray` directly, without mentioning `ArrayBuffer`. But a view cannot exist without an underlying `ArrayBuffer`, so gets created automatically in all these cases except the first one (when provided).
 
-To access the `ArrayBuffer`, there are properties:
-- `arr.buffer` -- references the `ArrayBuffer`.
-- `arr.byteLength` -- the length of the `ArrayBuffer`.
+To access the underlying `ArrayBuffer`, there are following properties in `TypedArray`:
+- `buffer` -- references the `ArrayBuffer`.
+- `byteLength` -- the length of the `ArrayBuffer`.
 
 So, we can always move from one view to another:
 ```js
diff --git a/7-animation/2-css-animations/3-animate-circle/solution.view/index.html b/7-animation/2-css-animations/3-animate-circle/solution.view/index.html
index 88b154254..43b927e8a 100644
--- a/7-animation/2-css-animations/3-animate-circle/solution.view/index.html
+++ b/7-animation/2-css-animations/3-animate-circle/solution.view/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <style>
     .circle {
-      transition-property: width, height, margin-left, margin-top;
+      transition-property: width, height;
       transition-duration: 2s;
       position: fixed;
       transform: translateX(-50%) translateY(-50%);
diff --git a/7-animation/2-css-animations/3-animate-circle/source.view/index.html b/7-animation/2-css-animations/3-animate-circle/source.view/index.html
index a423280de..e305f4cf6 100644
--- a/7-animation/2-css-animations/3-animate-circle/source.view/index.html
+++ b/7-animation/2-css-animations/3-animate-circle/source.view/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <style>
     .circle {
-      transition-property: width, height, margin-left, margin-top;
+      transition-property: width, height;
       transition-duration: 2s;
       position: fixed;
       transform: translateX(-50%) translateY(-50%);
diff --git a/7-animation/2-css-animations/4-animate-circle-callback/solution.view/index.html b/7-animation/2-css-animations/4-animate-circle-callback/solution.view/index.html
index b2192681c..64746e85f 100644
--- a/7-animation/2-css-animations/4-animate-circle-callback/solution.view/index.html
+++ b/7-animation/2-css-animations/4-animate-circle-callback/solution.view/index.html
@@ -10,7 +10,7 @@
       text-align: center;
     }
     .circle {
-      transition-property: width, height, margin-left, margin-top;
+      transition-property: width, height;
       transition-duration: 2s;
       position: fixed;
       transform: translateX(-50%) translateY(-50%);
diff --git a/7-animation/3-js-animation/1-animate-ball/solution.view/index.html b/7-animation/3-js-animation/1-animate-ball/solution.view/index.html
index 7e031e8d1..146033cf7 100644
--- a/7-animation/3-js-animation/1-animate-ball/solution.view/index.html
+++ b/7-animation/3-js-animation/1-animate-ball/solution.view/index.html
@@ -21,7 +21,7 @@
     }
 
     function bounce(timeFraction) {
-      for (let a = 0, b = 1, result; 1; a += b, b /= 2) {
+      for (let a = 0, b = 1; 1; a += b, b /= 2) {
         if (timeFraction >= (7 - 4 * a) / 11) {
           return -Math.pow((11 - 6 * a - 11 * timeFraction) / 4, 2) + Math.pow(b, 2)
         }
diff --git a/7-animation/3-js-animation/2-animate-ball-hops/solution.view/index.html b/7-animation/3-js-animation/2-animate-ball-hops/solution.view/index.html
index b246f422f..f587ff607 100644
--- a/7-animation/3-js-animation/2-animate-ball-hops/solution.view/index.html
+++ b/7-animation/3-js-animation/2-animate-ball-hops/solution.view/index.html
@@ -21,7 +21,7 @@
     }
 
     function bounce(timeFraction) {
-      for (let a = 0, b = 1, result; 1; a += b, b /= 2) {
+      for (let a = 0, b = 1; 1; a += b, b /= 2) {
         if (timeFraction >= (7 - 4 * a) / 11) {
           return -Math.pow((11 - 6 * a - 11 * timeFraction) / 4, 2) + Math.pow(b, 2)
         }
diff --git a/7-animation/3-js-animation/article.md b/7-animation/3-js-animation/article.md
index 517b2481b..5450d9045 100644
--- a/7-animation/3-js-animation/article.md
+++ b/7-animation/3-js-animation/article.md
@@ -283,7 +283,7 @@ The `bounce` function does the same, but in the reverse order: "bouncing" starts
 
 ```js
 function bounce(timeFraction) {
-  for (let a = 0, b = 1, result; 1; a += b, b /= 2) {
+  for (let a = 0, b = 1; 1; a += b, b /= 2) {
     if (timeFraction >= (7 - 4 * a) / 11) {
       return -Math.pow((11 - 6 * a - 11 * timeFraction) / 4, 2) + Math.pow(b, 2)
     }
diff --git a/7-animation/3-js-animation/bounce-easeinout.view/index.html b/7-animation/3-js-animation/bounce-easeinout.view/index.html
index 837c50db1..aed3d9d08 100644
--- a/7-animation/3-js-animation/bounce-easeinout.view/index.html
+++ b/7-animation/3-js-animation/bounce-easeinout.view/index.html
@@ -26,7 +26,7 @@
 
 
     function bounce(timeFraction) {
-      for (let a = 0, b = 1, result; 1; a += b, b /= 2) {
+      for (let a = 0, b = 1; 1; a += b, b /= 2) {
         if (timeFraction >= (7 - 4 * a) / 11) {
           return -Math.pow((11 - 6 * a - 11 * timeFraction) / 4, 2) + Math.pow(b, 2)
         }
diff --git a/7-animation/3-js-animation/bounce-easeout.view/index.html b/7-animation/3-js-animation/bounce-easeout.view/index.html
index e52eae8de..69dbb7ce0 100644
--- a/7-animation/3-js-animation/bounce-easeout.view/index.html
+++ b/7-animation/3-js-animation/bounce-easeout.view/index.html
@@ -22,7 +22,7 @@
     }
 
     function bounce(timeFraction) {
-      for (let a = 0, b = 1, result; 1; a += b, b /= 2) {
+      for (let a = 0, b = 1; 1; a += b, b /= 2) {
         if (timeFraction >= (7 - 4 * a) / 11) {
           return -Math.pow((11 - 6 * a - 11 * timeFraction) / 4, 2) + Math.pow(b, 2)
         }
diff --git a/7-animation/3-js-animation/bounce.view/index.html b/7-animation/3-js-animation/bounce.view/index.html
index 1be2580d9..3575ed820 100644
--- a/7-animation/3-js-animation/bounce.view/index.html
+++ b/7-animation/3-js-animation/bounce.view/index.html
@@ -19,7 +19,7 @@
       animate({
         duration: 3000,
         timing: function bounce(timeFraction) {
-          for (let a = 0, b = 1, result; 1; a += b, b /= 2) {
+          for (let a = 0, b = 1; 1; a += b, b /= 2) {
             if (timeFraction >= (7 - 4 * a) / 11) {
               return -Math.pow((11 - 6 * a - 11 * timeFraction) / 4, 2) + Math.pow(b, 2)
             }
diff --git a/7-animation/3-js-animation/text.view/index.html b/7-animation/3-js-animation/text.view/index.html
index e404fe5c4..001b0ae94 100644
--- a/7-animation/3-js-animation/text.view/index.html
+++ b/7-animation/3-js-animation/text.view/index.html
@@ -36,7 +36,7 @@
 
 
     function bounce(timeFraction) {
-      for (let a = 0, b = 1, result; 1; a += b, b /= 2) {
+      for (let a = 0, b = 1; 1; a += b, b /= 2) {
         if (timeFraction >= (7 - 4 * a) / 11) {
           return -Math.pow((11 - 6 * a - 11 * timeFraction) / 4, 2) + Math.pow(b, 2)
         }

From 4541b7af7584014a676da731f6e8774da5e059f6 Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@gmail.com>
Date: Wed, 3 Nov 2021 16:16:33 +0300
Subject: [PATCH 20/25] minor fixes

---
 1-js/05-data-types/03-string/article.md       |  2 +-
 .../solution.view/index.html                  |  3 +--
 .../3-image-gallery/solution.view/gallery.css | 10 ----------
 .../3-image-gallery/source.view/gallery.css   | 19 +++++++++----------
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/1-js/05-data-types/03-string/article.md b/1-js/05-data-types/03-string/article.md
index 3b07eccad..41bda2254 100644
--- a/1-js/05-data-types/03-string/article.md
+++ b/1-js/05-data-types/03-string/article.md
@@ -81,7 +81,7 @@ Here's the full list:
 | Character | Description |
 |-----------|-------------|
 |`\n`|New line|
-|`\r`|Carriage return: not used alone. Windows text files use a combination of two characters `\r\n` to represent a line break. |
+|`\r`|In Windows text files a combination of two characters `\r\n` represents a new break, while on non-Windows OS it's just `\n`. That's for historical reasons, most Windows software also understands `\n`. |
 |`\'`, `\"`|Quotes|
 |`\\`|Backslash|
 |`\t`|Tab|
diff --git a/2-ui/1-document/07-modifying-document/10-clock-setinterval/solution.view/index.html b/2-ui/1-document/07-modifying-document/10-clock-setinterval/solution.view/index.html
index de8ec9aee..84ee26f19 100644
--- a/2-ui/1-document/07-modifying-document/10-clock-setinterval/solution.view/index.html
+++ b/2-ui/1-document/07-modifying-document/10-clock-setinterval/solution.view/index.html
@@ -45,7 +45,7 @@
     function clockStart() {
       // set a new interval only if the clock is stopped
       // otherwise we would rewrite the timerID reference to the running interval and wouldn't be able to stop the clock ever again
-      if (!timerId) { 
+      if (!timerId) {
         timerId = setInterval(update, 1000);
       }
       update(); // <--  start right now, don't wait 1 second till the first setInterval works
@@ -56,7 +56,6 @@
       timerId = null; // <-- clear timerID to indicate that the clock has been stopped, so that it is possible to start it again in clockStart()
     }
 
-    clockStart();
   </script>
 
   <!-- click on this button calls clockStart() -->
diff --git a/2-ui/2-events/04-default-browser-action/3-image-gallery/solution.view/gallery.css b/2-ui/2-events/04-default-browser-action/3-image-gallery/solution.view/gallery.css
index 4522006ae..8d6472ee6 100644
--- a/2-ui/2-events/04-default-browser-action/3-image-gallery/solution.view/gallery.css
+++ b/2-ui/2-events/04-default-browser-action/3-image-gallery/solution.view/gallery.css
@@ -4,16 +4,6 @@ body {
   font: 75%/120% sans-serif;
 }
 
-h2 {
-  font: bold 190%/100% sans-serif;
-  margin: 0 0 .2em;
-}
-
-h2 em {
-  font: normal 80%/100% sans-serif;
-  color: #999999;
-}
-
 #largeImg {
   border: solid 1px #ccc;
   width: 550px;
diff --git a/2-ui/2-events/04-default-browser-action/3-image-gallery/source.view/gallery.css b/2-ui/2-events/04-default-browser-action/3-image-gallery/source.view/gallery.css
index b6e523014..8d6472ee6 100644
--- a/2-ui/2-events/04-default-browser-action/3-image-gallery/source.view/gallery.css
+++ b/2-ui/2-events/04-default-browser-action/3-image-gallery/source.view/gallery.css
@@ -4,16 +4,6 @@ body {
   font: 75%/120% sans-serif;
 }
 
-h2 {
-  font: bold 190%/100% sans-serif;
-  margin: 0 0 .2em;
-}
-
-h2 em {
-  font: normal 80%/100% sans-serif;
-  color: #999999;
-}
-
 #largeImg {
   border: solid 1px #ccc;
   width: 550px;
@@ -32,4 +22,13 @@ h2 em {
 
 #thumbs a:hover {
   border-color: #FF9900;
+}
+
+#thumbs li {
+  list-style: none;
+}
+
+#thumbs {
+  margin: 0;
+  padding: 0;
 }
\ No newline at end of file

From 0860d998ef00c875628b28d5873ce2253ae7d200 Mon Sep 17 00:00:00 2001
From: Osvaldo Dias dos Santos <vadodsantos@yahoo.com>
Date: Wed, 10 Nov 2021 23:05:58 +0100
Subject: [PATCH 21/25] Resolve conflict.

---
 1-js/09-classes/06-instanceof/article.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/1-js/09-classes/06-instanceof/article.md b/1-js/09-classes/06-instanceof/article.md
index d25a794fc..f7ddd5b34 100644
--- a/1-js/09-classes/06-instanceof/article.md
+++ b/1-js/09-classes/06-instanceof/article.md
@@ -86,14 +86,11 @@ The algorithm of `obj instanceof Class` works roughly as follows:
     *!*
     alert(rabbit instanceof Animal); // true
     */!*
-<<<<<<< HEAD
-    // rabbit.__proto__ === Rabbit.prototype
-=======
 
-    // rabbit.__proto__ === Animal.prototype (no match)
+    // rabbit.__proto__ === Rabbit.prototype
     *!*
->>>>>>> 4541b7af7584014a676da731f6e8774da5e059f6
     // rabbit.__proto__.__proto__ === Animal.prototype (match!)
+    */!*
     ```
 
 Here's the illustration of what `rabbit instanceof Animal` compares with `Animal.prototype`:

From 3012ec8b64b0332f4cd3e7e4bf7833972b2137fc Mon Sep 17 00:00:00 2001
From: Osvaldo Dias dos Santos <vadodsantos@yahoo.com>
Date: Wed, 10 Nov 2021 23:14:39 +0100
Subject: [PATCH 22/25] Resolve conflict.

---
 1-js/11-async/03-promise-chaining/article.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/1-js/11-async/03-promise-chaining/article.md b/1-js/11-async/03-promise-chaining/article.md
index d3ddbd3e3..dc54fe9ba 100644
--- a/1-js/11-async/03-promise-chaining/article.md
+++ b/1-js/11-async/03-promise-chaining/article.md
@@ -34,19 +34,11 @@ new Promise(function(resolve, reject) {
 
 A ideia é que o resultado seja passado através de uma cadeia de tratadores `.then`.
 
-<<<<<<< HEAD
 O fluxo é o seguinte:
 1. A promessa inicial é resolvida em 1 segundo `(*)`,
 2. Então o tratador de `.then` é chamado `(**)`, que por sua vez cria uma nova promessa (resolvida com o valor `2`).
 3. O próximo tratador `.then` `(***)` recebe o valor retornado pelo anterior, o processa (o duplica) e ele é passado ao próximo tratador.
 4. ...e assim por diante.
-=======
-Here the flow is:
-1. The initial promise resolves in 1 second `(*)`,
-2. Then the `.then` handler is called `(**)`, which in turn creates a new promise (resolved with `2` value).
-3. The next `then` `(***)` gets the result of the previous one, processes it (doubles) and passes it to the next handler.
-4. ...and so on.
->>>>>>> 4541b7af7584014a676da731f6e8774da5e059f6
 
 Como o resultado é passado através da cadeia de tratadores, podemos observar a sequência de chamadas `alert`: `1` -> `2` -> `4`.
 

From afc09869c37bb65fbcba61acc5f0223815cdea36 Mon Sep 17 00:00:00 2001
From: Osvaldo Dias dos Santos <vadodsantos@yahoo.com>
Date: Wed, 10 Nov 2021 23:22:12 +0100
Subject: [PATCH 23/25] Resolve conflict.

---
 1-js/13-modules/01-modules-intro/article.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/1-js/13-modules/01-modules-intro/article.md b/1-js/13-modules/01-modules-intro/article.md
index 0f2266745..83f105d31 100644
--- a/1-js/13-modules/01-modules-intro/article.md
+++ b/1-js/13-modules/01-modules-intro/article.md
@@ -261,11 +261,7 @@ In a module, top-level `this` is undefined, as opposed to a global object in non
 
 There are also several browser-specific differences of scripts with `type="module"` compared to regular ones.
 
-<<<<<<< HEAD
-You may want skip those for now if you're reading for the first time, or if you don't use JavaScript in a browser.
-=======
 You may want to skip this section for now if you're reading for the first time, or if you don't use JavaScript in a browser.
->>>>>>> 4541b7af7584014a676da731f6e8774da5e059f6
 
 ### Module scripts are deferred
 

From 36c28a11118bc240a5c7bd2a4c877455ab6886f6 Mon Sep 17 00:00:00 2001
From: Osvaldo Dias dos Santos <vadodsantos@yahoo.com>
Date: Wed, 10 Nov 2021 23:25:08 +0100
Subject: [PATCH 24/25] Resolve conflicts

---
 1-js/01-getting-started/1-intro/article.md    | 16 ----------------
 1-js/02-first-steps/01-hello-world/article.md |  6 +-----
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/1-js/01-getting-started/1-intro/article.md b/1-js/01-getting-started/1-intro/article.md
index fd03a8d2c..2f567f17b 100644
--- a/1-js/01-getting-started/1-intro/article.md
+++ b/1-js/01-getting-started/1-intro/article.md
@@ -59,11 +59,7 @@ Por exemplo, o JavaScript no navegador é capaz de:
 
 ## O que o JavaScript no navegador não pode fazer?
 
-<<<<<<< HEAD
 As habilidades do JavaScript no navegador são limitadas por uma questão de segurança do usuário. O objetivo é evitar que uma página maléfica acesse informações privadas ou prejudique os dados do usuário.
-=======
-JavaScript's abilities in the browser are limited for the sake of a user's safety. The aim is to prevent an evil webpage from accessing private information or harming the user's data.
->>>>>>> 4541b7af7584014a676da731f6e8774da5e059f6
 
 Exemplos de tais restrições incluem:
 
@@ -88,15 +84,9 @@ Esses limites não existem se o JavaScript for usado fora do navegador, por exem
 Há pelo menos *três* grandes aspectos do JavaScript:
 
 ```compare
-<<<<<<< HEAD
 + Integração total com HTML/CSS.
 + Coisas simples são feitas de forma simples.
 + Suporte para todos os principais navegadores e ativado por padrão.
-=======
-+ Full integration with HTML/CSS.
-+ Simple things are done simply.
-+ Supported by all major browsers and enabled by default.
->>>>>>> 4541b7af7584014a676da731f6e8774da5e059f6
 ```
 JavaScript é a única tecnologia de navegador que combina estas três qualidades.
 
@@ -127,12 +117,6 @@ Há mais. Claro que, mesmo que usemos uma dessas linguagens transpiladas, també
 
 ## Resumo
 
-<<<<<<< HEAD
 - O JavaScript foi inicialmente criado como uma linguagem somente de navegador, mas agora é usado em muitos outros ambientes também.
 - Hoje, o JavaScript tem uma posição única como a linguagem de navegador mais amplamente adotada, com integração total com HTML/CSS.
 - Existem muitas linguagens que são "transpiladas" para JavaScript e que oferecem certas funcionalidades. Recomenda-se dar uma olhada nelas, pelo menos brevemente, depois de dominar o JavaScript.
-=======
-- JavaScript was initially created as a browser-only language, but it is now used in many other environments as well.
-- Today, JavaScript has a unique position as the most widely-adopted browser language, fully integrated with HTML/CSS.
-- There are many languages that get "transpiled" to JavaScript and provide certain features. It is recommended to take a look at them, at least briefly, after mastering JavaScript.
->>>>>>> 4541b7af7584014a676da731f6e8774da5e059f6
diff --git a/1-js/02-first-steps/01-hello-world/article.md b/1-js/02-first-steps/01-hello-world/article.md
index fb1d4eba5..1642e3df0 100644
--- a/1-js/02-first-steps/01-hello-world/article.md
+++ b/1-js/02-first-steps/01-hello-world/article.md
@@ -73,11 +73,7 @@ Os arquivos de script são anexados ao HTML com o atributo `src`:
 <script src="/path/to/script.js"></script>
 ```
 
-<<<<<<< HEAD
-Aqui, `/path/to/script.js` é um caminho absoluto para o arquivo script (da raiz do site). Você também pode fornecer um caminho relativo a partir da página atual. Por exemplo, `src="script.js"` significaria um arquivo `"script.js"` na pasta atual.
-=======
-Here, `/path/to/script.js` is an absolute path to the script from the site root. One can also provide a relative path from the current page. For instance, `src="script.js"`, just like `src="./script.js"`, would mean a file `"script.js"` in the current folder.
->>>>>>> 4541b7af7584014a676da731f6e8774da5e059f6
+Aqui, `/path/to/script.js` é um caminho absoluto para o arquivo (script) da raiz do site. Você também pode fornecer um caminho relativo a partir da página atual. Por exemplo, `src="script.js"`, tal como `src="./script.js"`, significaria um arquivo `"script.js"` na pasta atual.
 
 Nós também podemos dar uma URL completa. Por exemplo:
 

From ff227c1cef99ca609c5895dc5879b4bf0604e642 Mon Sep 17 00:00:00 2001
From: Osvaldo Dias dos Santos <vadodsantos@yahoo.com>
Date: Wed, 10 Nov 2021 23:32:17 +0100
Subject: [PATCH 25/25] Resolve conflict.

---
 2-ui/1-document/05-basic-dom-node-properties/article.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/2-ui/1-document/05-basic-dom-node-properties/article.md b/2-ui/1-document/05-basic-dom-node-properties/article.md
index c5da646d0..32d9a0498 100644
--- a/2-ui/1-document/05-basic-dom-node-properties/article.md
+++ b/2-ui/1-document/05-basic-dom-node-properties/article.md
@@ -24,15 +24,10 @@ The classes are:
 - [HTMLElement](https://html.spec.whatwg.org/multipage/dom.html#htmlelement) -- is finally the basic class for all HTML elements. It is inherited by concrete HTML elements:
     - [HTMLInputElement](https://html.spec.whatwg.org/multipage/forms.html#htmlinputelement) -- the class for `<input>` elements,
     - [HTMLBodyElement](https://html.spec.whatwg.org/multipage/semantics.html#htmlbodyelement) -- the class for `<body>` elements,
-<<<<<<< HEAD
-    - [HTMLAnchorElement](https://html.spec.whatwg.org/multipage/semantics.html#htmlanchorelement) -- the class for `<a>` elements
-    - ...and so on, each tag has its own class that may provide specific properties and methods.
-=======
     - [HTMLAnchorElement](https://html.spec.whatwg.org/multipage/semantics.html#htmlanchorelement) -- the class for `<a>` elements,
     - ...and so on.
 
 There are many other tags with their own classes that may specific properties and methods, while some elements, such as `<span>`, `<section>`, `<article>` do not have any specific properties, so they are instances of `HTMLElement` class.
->>>>>>> 4541b7af7584014a676da731f6e8774da5e059f6
 
 So, the full set of properties and methods of a given node comes as the result of the inheritance.