merging all conflicts

Author: reactjs-translation-bot

content/community/courses.md

@@ -18,7 +18,7 @@ permalink: community/courses.html
 
 - [Frontend Armory: React Fundamentals](https://frontarm.com/courses/react-fundamentals/) - Learn React without the buzzwords.
 
-- [Egghead.io: The Beginner's Guide to ReactJS](https://egghead.io/courses/the-beginner-s-guide-to-reactjs) - Free course for React newbies and those looking to get a better understanding of React fundamentals.
+- [Egghead.io: The Beginner's Guide to ReactJS](https://egghead.io/courses/the-beginner-s-guide-to-react) - Free course for React newbies and those looking to get a better understanding of React fundamentals.
 
 - [Free React Bootcamp](https://tylermcginnis.com/free-react-bootcamp/) - Recordings from three days of a free online React bootcamp.
 

content/docs/create-a-new-react-app.md

@@ -39,7 +39,11 @@ React 팀의 추천 방법은 아래와 같습니다
 
 [Create React App](https://github.com/facebookincubator/create-react-app)은 **React 배우기**에 간편한 환경입니다. 그리고 시작하기에 최고의 방법은 **새로운 [싱글 페이지 애플리케이션](/docs/glossary.html#single-page-application)** 입니다.
 
+<<<<<<< HEAD
 이것은 개발 환경을 설정하고, 최신 JavaScript를 사용하게 해주며, 좋은 개발 경험과 프로덕션 앱 최적화를 해줍니다. [Node 8.10 혹은 상위 버전 및 npm 5.6 혹은 상위 버전](https://nodejs.org/en/)이 필요합니다. 새로운 프로젝트를 만들기 위해 아래의 명령어를 실행합니다.
+=======
+It sets up your development environment so that you can use the latest JavaScript features, provides a nice developer experience, and optimizes your app for production. You’ll need to have [Node >= 10.16 and npm >= 5.6](https://nodejs.org/en/) on your machine. To create a project, run:
+>>>>>>> 888d9eae7a33ec1a48c18f28e82c26d048d885be
 
 ```bash
 npx create-react-app my-app

content/docs/typechecking-with-proptypes.md

@@ -198,7 +198,11 @@ class Greeting extends React.Component {
 
 ### Function Components {#function-components}
 
+<<<<<<< HEAD
 함수 컴포넌트를 사용해서 개발한다면, PropTypes를 적절히 적용할 수 있도록 몇 가지 작은 변경사항을 만들어낼 수도 있습니다.
+=======
+If you are using function components in your regular development, you may want to make some small changes to allow PropTypes to be properly applied.
+>>>>>>> 888d9eae7a33ec1a48c18f28e82c26d048d885be
 
 아래와 같은 컴포넌트가 있다고 생각해봅시다.
 

plugins/gatsby-transformer-versions-yaml/gatsby-node.js

@@ -23,7 +23,7 @@ exports.onPostBuild = async ({store}) => {
   );
 
   // versions.yml structure is [{path: string, url: string, ...}, ...]
-  createRedirects(
+  await createRedirects(
     versions
       .filter(version => version.path && version.url)
       .map(version => ({