merging all conflicts

Author: reactjs-translation-bot

README.md

@@ -57,7 +57,7 @@ The documentation is divided into several sections with a different tone and pur
 
 ## Translation
 
-If you are interesting in translating `reactjs.org`, please see the current translation efforts at [isreactreadyyet.com](https://www.isreactreadyyet.com).
+If you are interesting in translating `reactjs.org`, please see the current translation efforts at [isreacttranslatedyet.com](https://www.isreacttranslatedyet.com/).
 
 
 If your language does not have a translation and you would like to create one, please follow the instructions at [reactjs.org Translations](https://github.com/reactjs/reactjs.org-translation#translating-reactjsorg).

content/docs/components-and-props.md

@@ -89,7 +89,11 @@ ReactDOM.render(
 >
 >React は小文字で始まるコンポーネントを DOM タグとして扱います。例えば、`<div />` は HTML の div タグを表しますが、`<Welcome />` はコンポーネントを表しており、スコープ内に `Welcome` が存在する必要があります。
 >
+<<<<<<< HEAD
 >この規約の背後にある理由については[こちら](/docs/jsx-in-depth.html#user-defined-components-must-be-capitalized)で読むことができます。
+=======
+>To learn more about the reasoning behind this convention, please read [JSX In Depth](/docs/jsx-in-depth.html#user-defined-components-must-be-capitalized).
+>>>>>>> 6dea652a709af39e90a88be45f0f45849ab29d17
 
 ## コンポーネントを組み合わせる {#composing-components}