Sync with upstream @ 19223ae7

1-js/02-first-steps/04-variables/article.md

@@ -157,7 +157,11 @@ let userName;
 let test123;
 ```
 
+<<<<<<< HEAD
 변수명이 여러 단어로 구성되어 있을 땐 [카멜 케이스(camelCase)](https://en.wikipedia.org/wiki/CamelCase) 가 흔히 사용됩니다. 카멜케이스는 단어를 차례대로 나열하면서 각 단어의 첫글자는 대문자로 작성합니다.: `myVeryLongName`.
+=======
+When the name contains multiple words, [camelCase](https://en.wikipedia.org/wiki/CamelCase) is commonly used. That is: words go one after another, each word except first starting with a capital letter: `myVeryLongName`.
+>>>>>>> 19223ae762f03cdff4e83f6f963f4f427af93847
 
 달러 기호 `'$'` 와 언더스코어(underscore) `'_'` 를 변수명에 사용할 수 있다는 점은 흥미로운 사실입니다. 이 특수기호는 문자처럼 특별한 의미가 없습니다.
 

1-js/02-first-steps/06-type-conversions/article.md

@@ -1,6 +1,10 @@
 # 형 변환(Type Conversions)
 
+<<<<<<< HEAD
 함수와 연산자에 전달되는 값은 대부분 적절한 자료형으로 자동 변환됩니다. 이런 과정을 "형 변환"이라고 합니다.
+=======
+Most of the time, operators and functions automatically convert the values given to them to the right type. 
+>>>>>>> 19223ae762f03cdff4e83f6f963f4f427af93847
 
 `alert`가 전달받은 값을 문자열로 자동 변환하여 보여주는 것이나, 수학 연산에서 전달된 값이 숫자로 변환되는 경우가 형 변환의 대표적인 예시입니다.
 

1-js/08-prototypes/02-function-prototype/article.md

@@ -50,7 +50,7 @@ On the picture, `"prototype"` is a horizontal arrow, meaning a regular property,
 ```smart header="`F.prototype` only used at `new F` time"
 `F.prototype` property is only used when `new F` is called, it assigns `[[Prototype]]` of the new object. After that, there's no connection between `F.prototype` and the new object. Think of it as a "one-time gift".
 
-If, after the creation, `F.prototype` property changes (`F.property = <another object>`), then new objects created by `new F` will have another object as `[[Prototype]]`, but already existing objects keep the old one.
+If, after the creation, `F.prototype` property changes (`F.prototype = <another object>`), then new objects created by `new F` will have another object as `[[Prototype]]`, but already existing objects keep the old one.
 ```
 
 ## 기본 F.prototype, 생성자 속성

1-js/09-classes/01-class/article.md

@@ -86,7 +86,7 @@ alert(typeof User); // function
 
 What `class User {...}` construct really does is:
 1. Creates a function named `User`, that becomes the result of the class declaration.
-    - The function code is taken from the `constructor` method (assumed empty is we don't write such method).
+    - The function code is taken from the `constructor` method (assumed empty if we don't write such method).
 3. Stores all methods, such as `sayHi`, in `User.prototype`.
 
 Afterwards, for new objects, when we call a method, it's taken from the prototype, just as  described in the chapter <info:function-prototype>. So `new User` object has access to class methods.