This PR was automatically generated to merge changes fromen.javascript.info at035c526

Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.

Alternatively, you can close this PR and merge conflicting changes manually.

The following files have conflicts and may need updates of the translations:

• 1-js/01-getting-started/3-code-editors/article.md
• 1-js/02-first-steps/04-variables/article.md
• 1-js/02-first-steps/05-types/article.md
• 1-js/02-first-steps/07-type-conversions/article.md
• 1-js/02-first-steps/08-operators/article.md
• 1-js/02-first-steps/10-ifelse/article.md

To merge changes manually (instead of merging this PR):

1. Add remote upstream that links to the English version (only needs to be done once)
   • git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
2. Commit all current work locally andgit checkout master
3. Pull the recent changes from the English version:
   • git pull upstream master
4. Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:
   • Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
     • git checkout --ours <path>
   • See the diff, what changed in the upstream file since branches diverged:
     • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
   • Then you can examine the changes in upstream and add them manually
5. When conflicts resolved, commit them andgit push origin master

This PR will be closed and replaced with a new one in a few days.