merging all conflicts

content/community/courses.md

@@ -18,9 +18,13 @@ permalink: community/courses.html
 
 - [React Armory: Salt React'i Öğrenin](https://reactarmory.com/guides/learn-react-by-itself) - React Armory ile React'i moda tabirlerle uğraşmadan öğrenin.
 
+<<<<<<< HEAD
 - [The Road To Learn React](https://www.robinwieruch.de/the-road-to-learn-react/) - Çetrefilli araçlar olmaksızın, salt React ile gerçek hayatta karşılığı olan bir uygulama geliştirin.
 
 - [Egghead.io: ReactJS için Başlangıç Rehberi](https://egghead.io/courses/the-beginner-s-guide-to-reactjs) - React'e yeni başlayanlar ve React temellerini daha iyi anlamak isteyenler için ücretsiz bir ders.
+=======
+- [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.
+>>>>>>> b4b59062e59d56da37274c6de1fa4a134d2d8f49
 
 - [Ücretsiz React Bootcamp'i](https://tylermcginnis.com/free-react-bootcamp/) - Ücretsiz bir React bootcamp'inin üç günlük kayıtları.
 
@@ -48,4 +52,10 @@ permalink: community/courses.html
 
 - [Tyler McGinnis](https://tylermcginnis.com/courses) - Tyler McGinnis, aylık bir ücret karşılığında derslerini erişime açıyor. Dersler arasında "React Temelleri" ve "Evrensel React" de var.
 
+<<<<<<< HEAD
 - [Mastering React](https://codewithmosh.com/p/mastering-react/) - React ile profesyonel, etkileşimli uygulamalar oluşturun.
+=======
+- [Mastering React](https://codewithmosh.com/p/mastering-react/) - Build professional interactive apps with React.
+
+- [Road to React](https://www.roadtoreact.com/) - Your journey to master React in JavaScript.
+>>>>>>> b4b59062e59d56da37274c6de1fa4a134d2d8f49

content/docs/concurrent-mode-patterns.md

@@ -792,7 +792,7 @@ The tradeoff we're making here is that `<ProfileTimeline>` will be inconsistent
 
 Whether or not it's an appropriate tradeoff depends on the situation. But it's a handy tool, especially when the content doesn't change noticeably between items, and the user might not even realize they were looking at a stale version for a second.
 
-It's worth noting that `useDeferredValue` is not *only* useful for data fetching. It also helps when an expensive component tree causes an interaction (e.g. typing in an input) to be sluggish. Just like we can "defer" a value that takes too long to fetch (and show its old value despite others components updating), we can do this with trees that take too long to render.
+It's worth noting that `useDeferredValue` is not *only* useful for data fetching. It also helps when an expensive component tree causes an interaction (e.g. typing in an input) to be sluggish. Just like we can "defer" a value that takes too long to fetch (and show its old value despite other components updating), we can do this with trees that take too long to render.
 
 For example, consider a filterable list like this:
 
@@ -926,7 +926,7 @@ function ProfilePage({ resource }) {
 
 The `revealOrder="forwards"` option means that the closest `<Suspense>` nodes inside this list **will only "reveal" their content in the order they appear in the tree -- even if the data for them arrives in a different order**. `<SuspenseList>` has other interesting modes: try changing `"forwards"` to `"backwards"` or `"together"` and see what happens.
 
-You can control how many loading states are visible at once with the `tail` prop. If we specify `tail="collapsed"`, we'll see *at most one* fallback at the time. You can play with it [here](https://codesandbox.io/s/adoring-almeida-1zzjh).
+You can control how many loading states are visible at once with the `tail` prop. If we specify `tail="collapsed"`, we'll see *at most one* fallback at a time. You can play with it [here](https://codesandbox.io/s/adoring-almeida-1zzjh).
 
 Keep in mind that `<SuspenseList>` is composable, like anything in React. For example, you can create a grid by putting several `<SuspenseList>` rows inside a `<SuspenseList>` table.
 

content/docs/state-and-lifecycle.md

@@ -418,12 +418,15 @@ Bu nedenle state'e, **yerel state** denir. State, kendisine sahip olan ve kendis
 Bir bileşen kendi state'ini, prop'lar aracılığıyla alt bileşenlere aktarabilir:
 
 ```js
+<<<<<<< HEAD
 <h2>It is {this.state.date.toLocaleTimeString()}.</h2>
 ```
 
 Kullanıcı tanımlı bileşenler için de bu durum geçerlidir:
 
 ```js
+=======
+>>>>>>> b4b59062e59d56da37274c6de1fa4a134d2d8f49
 <FormattedDate date={this.state.date} />
 ```
 

content/tutorial/tutorial.md

@@ -1203,7 +1203,11 @@ Tebrikler, bir tic-tac-toe oyunu kodladınız. Bu oyun:
 * Oyun ilerledikçe oyun geçmişini saklar,
 * Oyunculara oyun geçmişini görüntüleyebilmelerini ve oyun tahtasının önceji versiyonlarına gidebilmelerini sağlar.
 
+<<<<<<< HEAD
 İyi iş çıkardınız. Umarız artık React'in nasıl çalıştığını öğrenmişsinizdir.
+=======
+Nice work! We hope you now feel like you have a decent grasp of how React works.
+>>>>>>> b4b59062e59d56da37274c6de1fa4a134d2d8f49
 
 Kodun son haline **[buradan(https://codepen.io/gaearon/pen/gWWZgR?editors=0010)** bakabilirsiniz.
 

src/css/reset.css

@@ -13,6 +13,7 @@ html {
 body {
   overflow-x: hidden;
   position: relative;
+  filter: grayscale(100%);
 }
 
 * {