From 57f92e195d1f715cc054a2d4badd195cce547888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rado=C5=A1=20Mili=C4=87ev?=
 <40705899+rammba@users.noreply.github.com>
Date: Tue, 14 Apr 2026 19:12:19 +0200
Subject: [PATCH 1/2] Resolve conflicts with self-hosted images and
 non-trailing spaces

---
 .../learn/choosing-the-state-structure.md     |  76 +-
 src/content/learn/conditional-rendering.md    | 220 +----
 src/content/learn/creating-a-react-app.md     |   4 -
 src/content/learn/describing-the-ui.md        |  15 -
 src/content/learn/editor-setup.md             |   4 -
 .../javascript-in-jsx-with-curly-braces.md    |  12 +-
 src/content/learn/keeping-components-pure.md  |  45 +-
 .../learn/passing-props-to-a-component.md     |  26 +-
 .../learn/preserving-and-resetting-state.md   | 108 +--
 .../queueing-a-series-of-state-updates.md     |  16 +-
 .../learn/reacting-to-input-with-state.md     |  20 -
 src/content/learn/render-and-commit.md        |  21 +-
 src/content/learn/rendering-lists.md          |   4 -
 src/content/learn/responding-to-events.md     |  36 +-
 .../learn/sharing-state-between-components.md |   6 +-
 .../learn/state-a-components-memory.md        | 770 +++---------------
 src/content/learn/thinking-in-react.md        |  55 +-
 src/content/learn/tutorial-tic-tac-toe.md     |  23 +-
 .../learn/updating-objects-in-state.md        |  10 +-
 src/content/learn/writing-markup-with-jsx.md  |  37 -
 src/content/learn/your-first-component.md     |   7 -
 21 files changed, 182 insertions(+), 1333 deletions(-)

diff --git a/src/content/learn/choosing-the-state-structure.md b/src/content/learn/choosing-the-state-structure.md
index fb66ec0d..003e0023 100644
--- a/src/content/learn/choosing-the-state-structure.md
+++ b/src/content/learn/choosing-the-state-structure.md
@@ -458,11 +458,7 @@ export default function Menu() {
 
   return (
     <>
-<<<<<<< HEAD
-      <h2>Koja je vaša grickalica za put?</h2> 
-=======
-      <h2>What's your travel snack?</h2>
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+      <h2>Koja je vaša grickalica za put?</h2>
       <ul>
         {items.map((item, index) => (
           <li key={item.id}>
@@ -924,13 +920,8 @@ export const initialTravelPlan = {
   },
   10: {
     id: 10,
-<<<<<<< HEAD
     title: 'Amerika',
-    childIds: [11, 12, 13, 14, 15, 16, 17, 18],   
-=======
-    title: 'Americas',
     childIds: [11, 12, 13, 14, 15, 16, 17, 18],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   11: {
     id: 11,
@@ -974,13 +965,8 @@ export const initialTravelPlan = {
   },
   19: {
     id: 19,
-<<<<<<< HEAD
     title: 'Azija',
-    childIds: [20, 21, 22, 23, 24, 25],   
-=======
-    title: 'Asia',
     childIds: [20, 21, 22, 23, 24, 25],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   20: {
     id: 20,
@@ -1014,13 +1000,8 @@ export const initialTravelPlan = {
   },
   26: {
     id: 26,
-<<<<<<< HEAD
     title: 'Evropa',
-    childIds: [27, 28, 29, 30, 31, 32, 33],   
-=======
-    title: 'Europe',
     childIds: [27, 28, 29, 30, 31, 32, 33],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   27: {
     id: 27,
@@ -1059,13 +1040,8 @@ export const initialTravelPlan = {
   },
   34: {
     id: 34,
-<<<<<<< HEAD
     title: 'Okeanija',
-    childIds: [35, 36, 37, 38, 39, 40, 41],   
-=======
-    title: 'Oceania',
     childIds: [35, 36, 37, 38, 39, 40, 41],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   35: {
     id: 35,
@@ -1280,13 +1256,8 @@ export const initialTravelPlan = {
   },
   10: {
     id: 10,
-<<<<<<< HEAD
     title: 'Amerika',
-    childIds: [11, 12, 13, 14, 15, 16, 17, 18],   
-=======
-    title: 'Americas',
     childIds: [11, 12, 13, 14, 15, 16, 17, 18],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   11: {
     id: 11,
@@ -1330,13 +1301,8 @@ export const initialTravelPlan = {
   },
   19: {
     id: 19,
-<<<<<<< HEAD
     title: 'Azija',
-    childIds: [20, 21, 22, 23, 24, 25],   
-=======
-    title: 'Asia',
     childIds: [20, 21, 22, 23, 24, 25],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   20: {
     id: 20,
@@ -1370,13 +1336,8 @@ export const initialTravelPlan = {
   },
   26: {
     id: 26,
-<<<<<<< HEAD
     title: 'Evropa',
-    childIds: [27, 28, 29, 30, 31, 32, 33],   
-=======
-    title: 'Europe',
     childIds: [27, 28, 29, 30, 31, 32, 33],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   27: {
     id: 27,
@@ -1415,13 +1376,8 @@ export const initialTravelPlan = {
   },
   34: {
     id: 34,
-<<<<<<< HEAD
     title: 'Okeanija',
-    childIds: [35, 36, 37, 38, 39, 40, 41],   
-=======
-    title: 'Oceania',
     childIds: [35, 36, 37, 38, 39, 40, 41],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   35: {
     id: 35,
@@ -1639,13 +1595,8 @@ export const initialTravelPlan = {
   },
   10: {
     id: 10,
-<<<<<<< HEAD
     title: 'Amerika',
-    childIds: [11, 12, 13, 14, 15, 16, 17, 18],   
-=======
-    title: 'Americas',
     childIds: [11, 12, 13, 14, 15, 16, 17, 18],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   11: {
     id: 11,
@@ -1689,13 +1640,8 @@ export const initialTravelPlan = {
   },
   19: {
     id: 19,
-<<<<<<< HEAD
     title: 'Azija',
-    childIds: [20, 21, 22, 23, 24, 25,],   
-=======
-    title: 'Asia',
     childIds: [20, 21, 22, 23, 24, 25,],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   20: {
     id: 20,
@@ -1729,13 +1675,8 @@ export const initialTravelPlan = {
   },
   26: {
     id: 26,
-<<<<<<< HEAD
     title: 'Evropa',
-    childIds: [27, 28, 29, 30, 31, 32, 33],   
-=======
-    title: 'Europe',
     childIds: [27, 28, 29, 30, 31, 32, 33],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   27: {
     id: 27,
@@ -1774,13 +1715,8 @@ export const initialTravelPlan = {
   },
   34: {
     id: 34,
-<<<<<<< HEAD
     title: 'Okeanija',
-    childIds: [35, 36, 37, 38, 39, 40, 41],   
-=======
-    title: 'Oceania',
     childIds: [35, 36, 37, 38, 39, 40, 41],
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   },
   35: {
     id: 35,
@@ -1885,7 +1821,6 @@ Ponekad, možete smanjiti ugnježdenost state-a pomeranjem nekih ugnježdenih ob
 
 <Recap>
 
-<<<<<<< HEAD
 * Ako se dve state promenljive uvek istovremeno ažuriraju, pokušajte da ih spojite u jednu.
 * Pažljivo birajte state promenljive da biste izbegli kreiranje "nemogućih" stanja.
 * Strukturirajte state na način koji smanjuje šanse za pravljenje grešaka prilikom ažuriranja.
@@ -1893,15 +1828,6 @@ Ponekad, možete smanjiti ugnježdenost state-a pomeranjem nekih ugnježdenih ob
 * Ne stavljajte props *unutar* state-a osim ako specifično želite da sprečite ažuriranja.
 * Za UI šablone poput odabira, u state-u čuvajte ID ili indeks umesto celog objekta.
 * Ako je ažuriranje duboko ugnježdenog state-a komplikovano, probajte da ga flatten-ujete.
-=======
-* If two state variables always update together, consider merging them into one.
-* Choose your state variables carefully to avoid creating "impossible" states.
-* Structure your state in a way that reduces the chances that you'll make a mistake updating it.
-* Avoid redundant and duplicate state so that you don't need to keep it in sync.
-* Don't put props *into* state unless you specifically want to prevent updates.
-* For UI patterns like selection, keep ID or index in state instead of the object itself.
-* If updating deeply nested state is complicated, try flattening it.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 </Recap>
 
diff --git a/src/content/learn/conditional-rendering.md b/src/content/learn/conditional-rendering.md
index 31fe4d14..a6fb916e 100644
--- a/src/content/learn/conditional-rendering.md
+++ b/src/content/learn/conditional-rendering.md
@@ -32,31 +32,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          isPacked={true} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          isPacked={true} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          isPacked={false} 
-          name="Fotografija od Tam" 
-=======
         <Item
           isPacked={true}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           isPacked={true}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           isPacked={false}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
@@ -94,31 +80,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          isPacked={true} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          isPacked={true} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          isPacked={false} 
-          name="Fotografija od Tam" 
-=======
         <Item
           isPacked={true}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           isPacked={true}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           isPacked={false}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
@@ -160,31 +132,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          isPacked={true} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          isPacked={true} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          isPacked={false} 
-          name="Fotografija od Tam" 
-=======
         <Item
           isPacked={true}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           isPacked={true}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           isPacked={false}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
@@ -278,31 +236,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          isPacked={true} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          isPacked={true} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          isPacked={false} 
-          name="Fotografija od Tam" 
-=======
         <Item
           isPacked={true}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           isPacked={true}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           isPacked={false}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
@@ -346,31 +290,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          isPacked={true} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          isPacked={true} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          isPacked={false} 
-          name="Fotografija od Tam" 
-=======
         <Item
           isPacked={true}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           isPacked={true}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           isPacked={false}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
@@ -441,31 +371,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          isPacked={true} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          isPacked={true} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          isPacked={false} 
-          name="Fotografija od Tam" 
-=======
         <Item
           isPacked={true}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           isPacked={true}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           isPacked={false}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
@@ -501,31 +417,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          isPacked={true} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          isPacked={true} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          isPacked={false} 
-          name="Fotografija od Tam" 
-=======
         <Item
           isPacked={true}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           isPacked={true}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           isPacked={false}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
@@ -572,31 +474,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          isPacked={true} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          isPacked={true} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          isPacked={false} 
-          name="Fotografija od Tam" 
-=======
         <Item
           isPacked={true}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           isPacked={true}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           isPacked={false}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
@@ -624,31 +512,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          isPacked={true} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          isPacked={true} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          isPacked={false} 
-          name="Fotografija od Tam" 
-=======
         <Item
           isPacked={true}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           isPacked={true}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           isPacked={false}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
@@ -686,31 +560,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          importance={9} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          importance={0} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          importance={6} 
-          name="Fotografija od Tam" 
-=======
         <Item
           importance={9}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           importance={0}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           importance={6}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
@@ -744,31 +604,17 @@ export default function PackingList() {
     <section>
       <h1>Lista za pakovanje od Sally Ride</h1>
       <ul>
-<<<<<<< HEAD
-        <Item 
-          importance={9} 
-          name="Svemirsko odelo" 
-        />
-        <Item 
-          importance={0} 
-          name="Kaciga sa zlatnim listom" 
-        />
-        <Item 
-          importance={6} 
-          name="Fotografija od Tam" 
-=======
         <Item
           importance={9}
-          name="Space suit"
+          name="Svemirsko odelo"
         />
         <Item
           importance={0}
-          name="Helmet with a golden leaf"
+          name="Kaciga sa zlatnim listom"
         />
         <Item
           importance={6}
-          name="Photo of Tam"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+          name="Fotografija od Tam"
         />
       </ul>
     </section>
diff --git a/src/content/learn/creating-a-react-app.md b/src/content/learn/creating-a-react-app.md
index 08f74449..3844cccd 100644
--- a/src/content/learn/creating-a-react-app.md
+++ b/src/content/learn/creating-a-react-app.md
@@ -104,11 +104,7 @@ Server Components i Suspense su funkcionalnosti React-a, a ne Next.js-a. Međuti
 
 Ako vaša aplikacija ima ograničenja koja nisu dobro rešena u postojećim framework-ovima, ako želite da napravite sopstveni framework, ili samo želite naučiti osnove React aplikacija, postoji još opcija za započinjanje React projekta od nule.
 
-<<<<<<< HEAD
 Početak od nule vam pruža više fleksibilnosti, ali zahteva da napravite odluku koje alate ćete koristiti za rutiranje, fetch-ovanje podataka i ostale često korišćene šablone. To je kao da pravite sopstveni framework, a ne da koristite već postojeći. [Framework-ovi koje preporučujemo](#full-stack-frameworks) imaju ugrađena rešenja za ovakve probleme.
-=======
-Starting from scratch gives you more flexibility, but does require that you make choices on which tools to use for routing, data fetching, and other common usage patterns.  It's a lot like building your own framework, instead of using a framework that already exists. The [frameworks we recommend](#full-stack-frameworks) have built-in solutions for these problems.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 Ako želite napraviti vaša rešenja, pogledajte uputstvo kako [napraviti React aplikaciju od nule](/learn/build-a-react-app-from-scratch) za instrukcije oko postavki React projekta počevši od postojećih build alata kao što su [Vite](https://vite.dev/), [Parcel](https://parceljs.org/) ili [RSbuild](https://rsbuild.dev/).
 
diff --git a/src/content/learn/describing-the-ui.md b/src/content/learn/describing-the-ui.md
index 63947979..619c37a2 100644
--- a/src/content/learn/describing-the-ui.md
+++ b/src/content/learn/describing-the-ui.md
@@ -527,17 +527,10 @@ Pročitajte **[Održavanje komponenata čistim](/learn/keeping-components-pure)*
 
 ## Razumevanje vašeg UI-a kao stabla {/*understanding-your-ui-as-a-tree*/}
 
-<<<<<<< HEAD
 React koristi stabla da modeluje odnose između komponenata i modula.
 
 React stablo renderovanja je reprezentacija odnosa roditelj-dete između komponenata.
 
-=======
-React uses trees to model the relationships between components and modules.
-
-A React render tree is a representation of the parent and child relationship between components.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
-
 <Diagram name="generic_render_tree" height={250} width={500} alt="A tree graph with five nodes, with each node representing a component. The root node is located at the top the tree graph and is labelled 'Root Component'. It has two arrows extending down to two nodes labelled 'Component A' and 'Component C'. Each of the arrows is labelled with 'renders'. 'Component A' has a single 'renders' arrow to a node labelled 'Component B'. 'Component C' has a single 'renders' arrow to a node labelled 'Component D'.">
 
 Primer stabla renderovanja.
@@ -546,11 +539,7 @@ Primer stabla renderovanja.
 
 Komponente koje se nalaze bliže vrhu stabla, bliže korenu komponente, smatraju se komponentama najvišeg nivoa. Komponente bez podkomponenata su list komponente. Ova kategorizacija komponenata je korisna za razumevanje toka podataka i performansi renderovanja.
 
-<<<<<<< HEAD
 Modelovanje odnosa između JavaScript modula je još jedan koristan način za razumevanje vaše aplikacije. Mi ga nazivamo modul zavisnosti stablo.
-=======
-Modelling the relationship between JavaScript modules is another useful way to understand your app. We refer to it as a module dependency tree.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 <Diagram name="generic_dependency_tree" height={250} width={500} alt="A tree graph with five nodes. Each node represents a JavaScript module. The top-most node is labelled 'RootModule.js'. It has three arrows extending to the nodes: 'ModuleA.js', 'ModuleB.js', and 'ModuleC.js'. Each arrow is labelled as 'imports'. 'ModuleC.js' node has a single 'imports' arrow that points to a node labelled 'ModuleD.js'.">
 
@@ -558,11 +547,7 @@ Primer modul zavisnosti stabla.
 
 </Diagram>
 
-<<<<<<< HEAD
 Drvo zavisnosti često je korišćeno od strane alata za izgradnju da bi se sve JavaScript datoteke relevantne za klijenta spakovale u jednu datoteku. Velika veličina paketa regresira korisničko iskustvo za React aplikacije. Razumevanje modul zavisnosti stabla je korisno za otklanjanje grešaka.
-=======
-A dependency tree is often used by build tools to bundle all the relevant JavaScript code for the client to download and render. A large bundle size regresses user experience for React apps. Understanding the module dependency tree is helpful to debug such issues.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 <LearnMore path="/learn/understanding-your-ui-as-a-tree">
 
diff --git a/src/content/learn/editor-setup.md b/src/content/learn/editor-setup.md
index 1e227132..5b4a23ca 100644
--- a/src/content/learn/editor-setup.md
+++ b/src/content/learn/editor-setup.md
@@ -31,11 +31,7 @@ Neki editori dolaze sa ugrađenim funkcijama, dok drugi zahtevaju dodavanje ekst
 
 ### Linting {/*linting*/}
 
-<<<<<<< HEAD
 Linting alati pronalaze probleme u vašem kodu dok ga pišete, pomažući vam da ih ispravite na vreme. [ESLint](https://eslint.org/) je popularan open source linter za JavaScript.
-=======
-Code linters find problems in your code as you write, helping you fix them early. [ESLint](https://eslint.org/) is a popular, open source linter for JavaScript.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 * [Instalirajte ESLint sa preporučenom konfiguracijom za React](https://www.npmjs.com/package/eslint-config-react-app) (budite sigurni da imate [instaliran Node](https://nodejs.org/en/download/current/)!)
 * [Integrišite ESLint u VSCode sa zvaničnom ekstenzijom](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
diff --git a/src/content/learn/javascript-in-jsx-with-curly-braces.md b/src/content/learn/javascript-in-jsx-with-curly-braces.md
index 242a9a52..8e90977f 100644
--- a/src/content/learn/javascript-in-jsx-with-curly-braces.md
+++ b/src/content/learn/javascript-in-jsx-with-curly-braces.md
@@ -40,11 +40,7 @@ export default function Avatar() {
 
 </Sandpack>
 
-<<<<<<< HEAD
-Ovde, `"https://i.imgur.com/7vQD0fPs.jpg"` i `"Gregorio Y. Zara"` se prosleđuju kao stringovi.
-=======
-Here, `"https://react.dev/images/docs/scientists/7vQD0fPs.jpg"` and `"Gregorio Y. Zara"` are being passed as strings.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+Ovde, `"https://react.dev/images/docs/scientists/7vQD0fPs.jpg"` i `"Gregorio Y. Zara"` se prosleđuju kao stringovi.
 
 Ali šta ako želite da dinamički odredite `src` ili `alt` tekst? Možete **koristiti vrednost iz JavaScript-a zamenom `"` i `"` sa `{` i `}`**:
 
@@ -431,13 +427,9 @@ body > div > div { padding: 20px; }
 
 #### Napisati jedan izraz unutar vitičastih zagrada {/*write-one-expression-inside-curly-braces*/}
 
-<<<<<<< HEAD
 U objektu ispod, puni URL slike je podeljen na četiri dela: bazni URL, `imageId`, `imageSize` i ekstenzija fajla.
-=======
-We want the image URL to combine these attributes together: base URL (always `'https://react.dev/images/docs/scientists/'`), `imageId` (`'7vQD0fP'`), `imageSize` (`'s'`), and file extension (always `'.jpg'`). However, something is wrong with how the `<img>` tag specifies its `src`.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
-Mi želimo da URL slike kombinuje ove atribute zajedno: bazni URL (uvek `'https://i.imgur.com/'`), `imageId` (`'7vQD0fP'`), `imageSize` (`'s'`) i ekstenzija fajla (uvek `'.jpg'`). Međutim, nešto nije u redu sa načinom na koji `<img>` oznaka određuje svoj `src`.
+Mi želimo da URL slike kombinuje ove atribute zajedno: bazni URL (uvek `'https://react.dev/images/docs/scientists/'`), `imageId` (`'7vQD0fP'`), `imageSize` (`'s'`) i ekstenzija fajla (uvek `'.jpg'`). Međutim, nešto nije u redu sa načinom na koji `<img>` oznaka određuje svoj `src`.
 
 Možete li da popravite ovo?
 
diff --git a/src/content/learn/keeping-components-pure.md b/src/content/learn/keeping-components-pure.md
index b8d23e68..9271b8dd 100644
--- a/src/content/learn/keeping-components-pure.md
+++ b/src/content/learn/keeping-components-pure.md
@@ -27,23 +27,13 @@ Možda ste već upoznati sa jednim primerom čistih funkcija: formulama u matema
 
 Pogledajte ovu matematičku formulu: <Math><MathI>y</MathI> = 2<MathI>x</MathI></Math>.
 
-<<<<<<< HEAD
 Ako je <Math><MathI>x</MathI> = 2</Math> onda je <Math><MathI>y</MathI> = 4</Math>. Uvek.
 
 Ako je <Math><MathI>x</MathI> = 3</Math> onda je <Math><MathI>y</MathI> = 6</Math>. Uvek.
 
 Ako je <Math><MathI>x</MathI> = 3</Math>, <MathI>y</MathI> neće ponekad biti <Math>9</Math> ili <Math>–1</Math> ili <Math>2.5</Math> u zavisnosti od trenutnog vremena ili stanja na berzi.
 
-Ako je <Math><MathI>y</MathI> = 2<MathI>x</MathI></Math> i <Math><MathI>x</MathI> = 3</Math>, <MathI>y</MathI> će _uvek_ biti <Math>6</Math>. 
-=======
-If <Math><MathI>x</MathI> = 2</Math> then <Math><MathI>y</MathI> = 4</Math>. Always.
-
-If <Math><MathI>x</MathI> = 3</Math> then <Math><MathI>y</MathI> = 6</Math>. Always.
-
-If <Math><MathI>x</MathI> = 3</Math>, <MathI>y</MathI> won't sometimes be <Math>9</Math> or <Math>–1</Math> or <Math>2.5</Math> depending on the time of day or the state of the stock market.
-
-If <Math><MathI>y</MathI> = 2<MathI>x</MathI></Math> and <Math><MathI>x</MathI> = 3</Math>, <MathI>y</MathI> will _always_ be <Math>6</Math>.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+Ako je <Math><MathI>y</MathI> = 2<MathI>x</MathI></Math> i <Math><MathI>x</MathI> = 3</Math>, <MathI>y</MathI> će _uvek_ biti <Math>6</Math>.
 
 Ako prebacimo ovo u JavaScript funkciju, izgledalo bi ovako:
 
@@ -62,17 +52,10 @@ React je dizajniran oko ovog koncepta. **React pretpostavlja da je svaka kompone
 ```js src/App.js
 function Recipe({ drinkers }) {
   return (
-<<<<<<< HEAD
-    <ol>    
+    <ol>
       <li>Skuvati {drinkers} časa sa vodom.</li>
       <li>Dodati {drinkers} kašika čaja i {0.5 * drinkers} kašika začina.</li>
       <li>Dodati {0.5 * drinkers} šolja mleka da provri i šećer po ukusu.</li>
-=======
-    <ol>
-      <li>Boil {drinkers} cups of water.</li>
-      <li>Add {drinkers} spoons of tea and {0.5 * drinkers} spoons of spice.</li>
-      <li>Add {0.5 * drinkers} cups of milk to boil and sugar to taste.</li>
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
     </ol>
   );
 }
@@ -92,19 +75,11 @@ export default function App() {
 
 </Sandpack>
 
-<<<<<<< HEAD
-Kada prosledite `drinkers={2}` u `Recipe`, on će vratiti JSX koji sadrži `2 časa sa vodom`. Uvek. 
-=======
-When you pass `drinkers={2}` to `Recipe`, it will return JSX containing `2 cups of water`. Always.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+Kada prosledite `drinkers={2}` u `Recipe`, on će vratiti JSX koji sadrži `2 časa sa vodom`. Uvek.
 
 Ako prosledite `drinkers={4}`, on će vratiti JSX koji sadrži `4 časa sa vodom`. Uvek.
 
-<<<<<<< HEAD
-Baš kao matematička formula. 
-=======
-Just like a math formula.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+Baš kao matematička formula.
 
 Možete gledati vaše komponente kao recepte: ako ih pratite i ne dodajete nove sastojke tokom kuvanja, svaki put ćete dobiti isto jelo. To "jelo" je JSX koji će komponenta servirati React-u da [renderuje](/learn/render-and-commit).
 
@@ -240,23 +215,13 @@ Svaka nova React funkcionalnost koju pravimo koristi prednosti čistoće. Održa
 
 <Recap>
 
-<<<<<<< HEAD
 * Komponenta mora biti čista, što znači da:
   * **Gleda samo svoja posla.** Ne bi trebalo da menja nikakve objekte ili promenljive koji su postojali pre renderovanja.
-  * **Isti input-i, isti rezultat.** Dobijanjem istih input-a, komponenta treba uvek da vrati isti JSX. 
+  * **Isti input-i, isti rezultat.** Dobijanjem istih input-a, komponenta treba uvek da vrati isti JSX.
 * Renderovanje se može desiti u bilo kom trenutku, pa komponente ne bi trebale da zavise od drugih.
 * Ne bi trebali da menjate nijedan od input-a koje komponenta koristi za renderovanje. To uključuje props, state i context. Da biste ažurirali prikaz, ["setujte" state](/learn/state-a-components-memory) umesto da menjate već postojeće objekte.
 * Težite da izrazite logiku komponente u JSX-u koji vraćate. Kada trebate "menjati stvari", uglavnom ćete želeti da to uradite u event handler-u. Kao poslednje rešenje, možete koristiti `useEffect`.
 * Pisanje čistih funkcija zahteva malo iskustva, ali otključava moć React paradigme.
-=======
-* A component must be pure, meaning:
-  * **It minds its own business.** It should not change any objects or variables that existed before rendering.
-  * **Same inputs, same output.** Given the same inputs, a component should always return the same JSX.
-* Rendering can happen at any time, so components should not depend on each others' rendering sequence.
-* You should not mutate any of the inputs that your components use for rendering. That includes props, state, and context. To update the screen, ["set" state](/learn/state-a-components-memory) instead of mutating preexisting objects.
-* Strive to express your component's logic in the JSX you return. When you need to "change things", you'll usually want to do it in an event handler. As a last resort, you can `useEffect`.
-* Writing pure functions takes a bit of practice, but it unlocks the power of React's paradigm.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 </Recap>
 
diff --git a/src/content/learn/passing-props-to-a-component.md b/src/content/learn/passing-props-to-a-component.md
index 493eafd3..c35f9611 100644
--- a/src/content/learn/passing-props-to-a-component.md
+++ b/src/content/learn/passing-props-to-a-component.md
@@ -453,21 +453,12 @@ export default function Gallery() {
         />
         <ul>
           <li>
-<<<<<<< HEAD
-            <b>Profesija: </b> 
+            <b>Profesija: </b>
             fizičar i hemičar
           </li>
           <li>
-            <b>Nagrade: 4 </b> 
+            <b>Nagrade: 4 </b>
             (Nobelova nagrada za fiziku, Nobelova nagrada za hemiju, Davy medalja, Matteucci medalja)
-=======
-            <b>Profession: </b>
-            physicist and chemist
-          </li>
-          <li>
-            <b>Awards: 4 </b>
-            (Nobel Prize in Physics, Nobel Prize in Chemistry, Davy Medal, Matteucci Medal)
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
           </li>
           <li>
             <b>Otkrića: </b>
@@ -486,21 +477,12 @@ export default function Gallery() {
         />
         <ul>
           <li>
-<<<<<<< HEAD
-            <b>Profesija: </b> 
+            <b>Profesija: </b>
             geohemičar
           </li>
           <li>
-            <b>Nagrade: 2 </b> 
+            <b>Nagrade: 2 </b>
             (Miyake nagrada za geohemiju, Tanaka nagrada)
-=======
-            <b>Profession: </b>
-            geochemist
-          </li>
-          <li>
-            <b>Awards: 2 </b>
-            (Miyake Prize for geochemistry, Tanaka Prize)
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
           </li>
           <li>
             <b>Otkrića: </b>
diff --git a/src/content/learn/preserving-and-resetting-state.md b/src/content/learn/preserving-and-resetting-state.md
index 735d1c84..6e028f97 100644
--- a/src/content/learn/preserving-and-resetting-state.md
+++ b/src/content/learn/preserving-and-resetting-state.md
@@ -86,11 +86,7 @@ label {
 
 </Sandpack>
 
-<<<<<<< HEAD
 Evo kako to izgleda u obliku stabla:
-=======
-Here's how these look as a tree:
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 <DiagramGroup>
 
@@ -500,11 +496,7 @@ export default function App() {
   return (
     <div>
       {isPaused ? (
-<<<<<<< HEAD
-        <p>Vidimo se posle!</p> 
-=======
-        <p>See you later!</p>
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        <p>Vidimo se posle!</p>
       ) : (
         <Counter />
       )}
@@ -1439,26 +1431,16 @@ export default function App() {
   if (reverse) {
     return (
       <>
-<<<<<<< HEAD
-        <Field label="Prezime" /> 
+        <Field label="Prezime" />
         <Field label="Ime" />
-=======
-        <Field label="Last name" />
-        <Field label="First name" />
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
         {checkbox}
       </>
     );
   } else {
     return (
       <>
-<<<<<<< HEAD
-        <Field label="Ime" /> 
+        <Field label="Ime" />
         <Field label="Prezime" />
-=======
-        <Field label="First name" />
-        <Field label="Last name" />
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
         {checkbox}
       </>
     );
@@ -1511,26 +1493,16 @@ export default function App() {
   if (reverse) {
     return (
       <>
-<<<<<<< HEAD
-        <Field key="lastName" label="Prezime" /> 
+        <Field key="lastName" label="Prezime" />
         <Field key="firstName" label="Ime" />
-=======
-        <Field key="lastName" label="Last name" />
-        <Field key="firstName" label="First name" />
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
         {checkbox}
       </>
     );
   } else {
     return (
       <>
-<<<<<<< HEAD
-        <Field key="firstName" label="Ime" /> 
+        <Field key="firstName" label="Ime" />
         <Field key="lastName" label="Prezime" />
-=======
-        <Field key="firstName" label="First name" />
-        <Field key="lastName" label="Last name" />
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
         {checkbox}
       </>
     );
@@ -1915,49 +1887,26 @@ export default function Gallery() {
 }
 
 let images = [{
-<<<<<<< HEAD
   place: 'Penang, Malezija',
-  src: 'https://i.imgur.com/FJeJR8M.jpg'
-}, {
-  place: 'Lisabon, Portugal',
-  src: 'https://i.imgur.com/dB2LRbj.jpg'
-}, {
-  place: 'Bilbao, Španija',
-  src: 'https://i.imgur.com/z08o2TS.jpg'
-}, {
-  place: 'Valparaíso, Čile',
-  src: 'https://i.imgur.com/Y3utgTi.jpg'
-}, {
-  place: 'Švic, Švajcarska',
-  src: 'https://i.imgur.com/JBbMpWY.jpg'
-}, {
-  place: 'Prag, Češka',
-  src: 'https://i.imgur.com/QwUKKmF.jpg'
-}, {
-  place: 'Ljubljana, Slovenija',
-  src: 'https://i.imgur.com/3aIiwfm.jpg'
-=======
-  place: 'Penang, Malaysia',
   src: 'https://react.dev/images/docs/scientists/FJeJR8M.jpg'
 }, {
-  place: 'Lisbon, Portugal',
+  place: 'Lisabon, Portugal',
   src: 'https://react.dev/images/docs/scientists/dB2LRbj.jpg'
 }, {
-  place: 'Bilbao, Spain',
+  place: 'Bilbao, Španija',
   src: 'https://react.dev/images/docs/scientists/z08o2TS.jpg'
 }, {
-  place: 'Valparaíso, Chile',
+  place: 'Valparaíso, Čile',
   src: 'https://react.dev/images/docs/scientists/Y3utgTi.jpg'
 }, {
-  place: 'Schwyz, Switzerland',
+  place: 'Švic, Švajcarska',
   src: 'https://react.dev/images/docs/scientists/JBbMpWY.jpg'
 }, {
-  place: 'Prague, Czechia',
+  place: 'Prag, Češka',
   src: 'https://react.dev/images/docs/scientists/QwUKKmF.jpg'
 }, {
-  place: 'Ljubljana, Slovenia',
+  place: 'Ljubljana, Slovenija',
   src: 'https://react.dev/images/docs/scientists/3aIiwfm.jpg'
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 }];
 ```
 
@@ -2006,49 +1955,26 @@ export default function Gallery() {
 }
 
 let images = [{
-<<<<<<< HEAD
   place: 'Penang, Malezija',
-  src: 'https://i.imgur.com/FJeJR8M.jpg'
-}, {
-  place: 'Lisabon, Portugal',
-  src: 'https://i.imgur.com/dB2LRbj.jpg'
-}, {
-  place: 'Bilbao, Španija',
-  src: 'https://i.imgur.com/z08o2TS.jpg'
-}, {
-  place: 'Valparaíso, Čile',
-  src: 'https://i.imgur.com/Y3utgTi.jpg'
-}, {
-  place: 'Švic, Švajcarska',
-  src: 'https://i.imgur.com/JBbMpWY.jpg'
-}, {
-  place: 'Prag, Češka',
-  src: 'https://i.imgur.com/QwUKKmF.jpg'
-}, {
-  place: 'Ljubljana, Slovenija',
-  src: 'https://i.imgur.com/3aIiwfm.jpg'
-=======
-  place: 'Penang, Malaysia',
   src: 'https://react.dev/images/docs/scientists/FJeJR8M.jpg'
 }, {
-  place: 'Lisbon, Portugal',
+  place: 'Lisabon, Portugal',
   src: 'https://react.dev/images/docs/scientists/dB2LRbj.jpg'
 }, {
-  place: 'Bilbao, Spain',
+  place: 'Bilbao, Španija',
   src: 'https://react.dev/images/docs/scientists/z08o2TS.jpg'
 }, {
-  place: 'Valparaíso, Chile',
+  place: 'Valparaíso, Čile',
   src: 'https://react.dev/images/docs/scientists/Y3utgTi.jpg'
 }, {
-  place: 'Schwyz, Switzerland',
+  place: 'Švic, Švajcarska',
   src: 'https://react.dev/images/docs/scientists/JBbMpWY.jpg'
 }, {
-  place: 'Prague, Czechia',
+  place: 'Prag, Češka',
   src: 'https://react.dev/images/docs/scientists/QwUKKmF.jpg'
 }, {
-  place: 'Ljubljana, Slovenia',
+  place: 'Ljubljana, Slovenija',
   src: 'https://react.dev/images/docs/scientists/3aIiwfm.jpg'
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 }];
 ```
 
diff --git a/src/content/learn/queueing-a-series-of-state-updates.md b/src/content/learn/queueing-a-series-of-state-updates.md
index d72fb96f..8b4239c4 100644
--- a/src/content/learn/queueing-a-series-of-state-updates.md
+++ b/src/content/learn/queueing-a-series-of-state-updates.md
@@ -178,11 +178,7 @@ Tokom narednog rendera React prolazi kroz red čekanja za state:
 | "zameni sa `5`"           | `0` (neupotrebljeno) | `5`               |
 | `n => n + 1`              | `5`                  | `5 + 1 = 6`       |
 
-<<<<<<< HEAD
 React čuva `6` kao konačan rezultat i vraća ga iz `useState`.
-=======
-React stores `6` as the final result and returns it from `useState`.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 <Note>
 
@@ -310,11 +306,7 @@ export default function RequestTracker() {
         Završeno: {completed}
       </h3>
       <button onClick={handleClick}>
-<<<<<<< HEAD
-        Kupi     
-=======
-        Buy
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        Kupi
       </button>
     </>
   );
@@ -358,11 +350,7 @@ export default function RequestTracker() {
         Završeno: {completed}
       </h3>
       <button onClick={handleClick}>
-<<<<<<< HEAD
-        Kupi     
-=======
-        Buy
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        Kupi
       </button>
     </>
   );
diff --git a/src/content/learn/reacting-to-input-with-state.md b/src/content/learn/reacting-to-input-with-state.md
index 81271963..f3a65ece 100644
--- a/src/content/learn/reacting-to-input-with-state.md
+++ b/src/content/learn/reacting-to-input-with-state.md
@@ -517,13 +517,8 @@ export default function Picture() {
     <div className="background background--active">
       <img
         className="picture"
-<<<<<<< HEAD
         alt="Dugine kuće u Kampung Pelangi, Indonezija"
-        src="https://i.imgur.com/5qwVYb1.jpeg"
-=======
-        alt="Rainbow houses in Kampung Pelangi, Indonesia"
         src="https://react.dev/images/docs/scientists/5qwVYb1.jpeg"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
       />
     </div>
   );
@@ -598,13 +593,8 @@ export default function Picture() {
           setIsActive(true);
         }}
         className={pictureClassName}
-<<<<<<< HEAD
         alt="Dugine kuće u Kampung Pelangi, Indonezija"
-        src="https://i.imgur.com/5qwVYb1.jpeg"
-=======
-        alt="Rainbow houses in Kampung Pelangi, Indonesia"
         src="https://react.dev/images/docs/scientists/5qwVYb1.jpeg"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
       />
     </div>
   );
@@ -658,13 +648,8 @@ export default function Picture() {
       >
         <img
           className="picture picture--active"
-<<<<<<< HEAD
           alt="Dugine kuće u Kampung Pelangi, Indonezija"
-          src="https://i.imgur.com/5qwVYb1.jpeg"
-=======
-          alt="Rainbow houses in Kampung Pelangi, Indonesia"
           src="https://react.dev/images/docs/scientists/5qwVYb1.jpeg"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
           onClick={e => e.stopPropagation()}
         />
       </div>
@@ -674,13 +659,8 @@ export default function Picture() {
     <div className="background background--active">
       <img
         className="picture"
-<<<<<<< HEAD
         alt="Dugine kuće u Kampung Pelangi, Indonezija"
-        src="https://i.imgur.com/5qwVYb1.jpeg"
-=======
-        alt="Rainbow houses in Kampung Pelangi, Indonesia"
         src="https://react.dev/images/docs/scientists/5qwVYb1.jpeg"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
         onClick={() => setIsActive(true)}
       />
     </div>
diff --git a/src/content/learn/render-and-commit.md b/src/content/learn/render-and-commit.md
index a15ea4a3..63a83bb0 100644
--- a/src/content/learn/render-and-commit.md
+++ b/src/content/learn/render-and-commit.md
@@ -54,13 +54,8 @@ root.render(<Image />);
 export default function Image() {
   return (
     <img
-<<<<<<< HEAD
-      src="https://i.imgur.com/ZF6s192.jpg"
-      alt="'Floralis Genérica' napravio Eduardo Catalano: ogromna metalik skulptura cveta sa reflektujućim laticama"
-=======
       src="https://react.dev/images/docs/scientists/ZF6s192.jpg"
-      alt="'Floralis Genérica' by Eduardo Catalano: a gigantic metallic flower sculpture with reflective petals"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+      alt="'Floralis Genérica' napravio Eduardo Catalano: ogromna metalik skulptura cveta sa reflektujućim laticama"
     />
   );
 }
@@ -108,13 +103,8 @@ export default function Gallery() {
 function Image() {
   return (
     <img
-<<<<<<< HEAD
-      src="https://i.imgur.com/ZF6s192.jpg"
-      alt="'Floralis Genérica' napravio Eduardo Catalano: ogromna metalik skulptura cveta sa reflektujućim laticama"
-=======
       src="https://react.dev/images/docs/scientists/ZF6s192.jpg"
-      alt="'Floralis Genérica' by Eduardo Catalano: a gigantic metallic flower sculpture with reflective petals"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+      alt="'Floralis Genérica' napravio Eduardo Catalano: ogromna metalik skulptura cveta sa reflektujućim laticama"
     />
   );
 }
@@ -134,13 +124,8 @@ img { margin: 0 10px 10px 0; }
 
 </Sandpack>
 
-<<<<<<< HEAD
-* **Tokom inicijalnog rendera** React će [kreirati DOM čvorove](https://developer.mozilla.org/docs/Web/API/Document/createElement) za `<section>`, `<h1>` i tri `<img>` tag-a. 
+* **Tokom inicijalnog rendera** React će [kreirati DOM čvorove](https://developer.mozilla.org/docs/Web/API/Document/createElement) za `<section>`, `<h1>` i tri `<img>` tag-a.
 * **Tokom ponovnog rendera** React će izračunati koja od njihovih polja (ili nijedno) su se promenila od prethodnog rendera. Neće uraditi ništa sa tom informacijom do narednog koraka, commit faze.
-=======
-* **During the initial render,** React will [create the DOM nodes](https://developer.mozilla.org/docs/Web/API/Document/createElement) for `<section>`, `<h1>`, and three `<img>` tags.
-* **During a re-render,** React will calculate which of their properties, if any, have changed since the previous render. It won't do anything with that information until the next step, the commit phase.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 <Pitfall>
 
diff --git a/src/content/learn/rendering-lists.md b/src/content/learn/rendering-lists.md
index 32f75724..23a54898 100644
--- a/src/content/learn/rendering-lists.md
+++ b/src/content/learn/rendering-lists.md
@@ -121,11 +121,7 @@ const people = [{
 }, {
   id: 3,
   name: 'Percy Lavon Julian',
-<<<<<<< HEAD
   profession: 'hemičar',
-=======
-  profession: 'chemist',
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 }, {
   id: 4,
   name: 'Subrahmanyan Chandrasekhar',
diff --git a/src/content/learn/responding-to-events.md b/src/content/learn/responding-to-events.md
index 4d4702b4..6c16fcdb 100644
--- a/src/content/learn/responding-to-events.md
+++ b/src/content/learn/responding-to-events.md
@@ -169,11 +169,7 @@ Ovo omogućava tim dugmićima da prikažu različite poruke. Probajte da promeni
 
 ### Prosleđivanje event handler-a kao prop-a {/*passing-event-handlers-as-props*/}
 
-<<<<<<< HEAD
-Često ćete želeti da roditeljska komponenta specificira dečji event handler. Razmotrite dugmiće: u zavisnosti od toga gde koristite `Button` komponentu, možete poželeti da izvršite različite funkcije—jedna da pušta film, druga da upload-uje sliku. 
-=======
-Often you'll want the parent component to specify a child's event handler. Consider buttons: depending on where you're using a `Button` component, you might want to execute a different function—perhaps one plays a movie and another uploads an image.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+Često ćete želeti da roditeljska komponenta specificira dečji event handler. Razmotrite dugmiće: u zavisnosti od toga gde koristite `Button` komponentu, možete poželeti da izvršite različite funkcije—jedna da pušta film, druga da upload-uje sliku.
 
 Da biste to uradili, prosledite prop koji komponenta primi od roditelja kao event handler:
 
@@ -316,21 +312,12 @@ button { margin-right: 10px; }
 
 </Sandpack>
 
-<<<<<<< HEAD
 Primetite da `App` komponenta ne mora da zna *šta* će `Toolbar` uraditi sa `onPlayMovie` i `onUploadImage`. To je implementacijski detalj u `Toolbar`-u. Takođe, `Toolbar` ih prosleđuje kao `onClick` handler-e u svoje `Button`-e, ali ih kasnije može okinuti i za prečicu na tastaturi. Imenovanje event handler props-a na osnovu koncepata specifičnih za aplikaciju poput `onPlayMovie` vam daje fleksibilnost da kasnije menjate kako se koriste.
-  
-<Note>
-
-Postarajte se da koristite odgovarajuće HTML tag-ove za event handler-e. Na primer, za klikove, koristite [`<button onClick={handleClick}>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button) umesto `<div onClick={handleClick}>`. Korišćenjem `<button>`-a u pretraživaču omogućavate ugrađena ponašanja pretraživača poput navigacije pomoću tastature. Ako vam se ne sviđa default stajling dugmeta u pretraživaču i želite da liči na link ili drugi UI element, to možete učititi pomoću CSS-a. [Naučite više o pisanju pristupačnog markup-a](https://developer.mozilla.org/en-US/docs/Learn/Accessibility/HTML).
-  
-=======
-Notice how the `App` component does not need to know *what* `Toolbar` will do with `onPlayMovie` or `onUploadImage`. That's an implementation detail of the `Toolbar`. Here, `Toolbar` passes them down as `onClick` handlers to its `Button`s, but it could later also trigger them on a keyboard shortcut. Naming props after app-specific interactions like `onPlayMovie` gives you the flexibility to change how they're used later.
 
 <Note>
 
-Make sure that you use the appropriate HTML tags for your event handlers. For example, to handle clicks, use [`<button onClick={handleClick}>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button) instead of `<div onClick={handleClick}>`. Using a real browser `<button>` enables built-in browser behaviors like keyboard navigation. If you don't like the default browser styling of a button and want to make it look more like a link or a different UI element, you can achieve it with CSS. [Learn more about writing accessible markup.](https://developer.mozilla.org/en-US/docs/Learn/Accessibility/HTML)
+Postarajte se da koristite odgovarajuće HTML tag-ove za event handler-e. Na primer, za klikove, koristite [`<button onClick={handleClick}>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button) umesto `<div onClick={handleClick}>`. Korišćenjem `<button>`-a u pretraživaču omogućavate ugrađena ponašanja pretraživača poput navigacije pomoću tastature. Ako vam se ne sviđa default stajling dugmeta u pretraživaču i želite da liči na link ili drugi UI element, to možete učititi pomoću CSS-a. [Naučite više o pisanju pristupačnog markup-a](https://developer.mozilla.org/en-US/docs/Learn/Accessibility/HTML).
 
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 </Note>
 
 ## Propagacija event-ova {/*event-propagation*/}
@@ -424,21 +411,12 @@ button { margin: 5px; }
 
 Kada kliknete na dugme:
 
-<<<<<<< HEAD
-1. React poziva `onClick` handler prosleđen u `<button>`. 
+1. React poziva `onClick` handler prosleđen u `<button>`.
 2. Taj handler, definisan u `Button`-u, radi sledeće:
    * Poziva `e.stopPropagation()`, sprečavajući da se event propagira dalje.
    * Poziva `onClick` funkciju, koja je prop prosleđen iz `Toolbar` komponente.
 3. Ta funkcija, definisana u `Toolbar` komponenti, prikazuje poruku specifičnu za dugme.
 4. Pošto je propagacija zaustavljena, `onClick` handler u roditeljskom `<div>`-u se *ne* pokreće.
-=======
-1. React calls the `onClick` handler passed to `<button>`.
-2. That handler, defined in `Button`, does the following:
-   * Calls `e.stopPropagation()`, preventing the event from bubbling further.
-   * Calls the `onClick` function, which is a prop passed from the `Toolbar` component.
-3. That function, defined in the `Toolbar` component, displays the button's own alert.
-4. Since the propagation was stopped, the parent `<div>`'s `onClick` handler does *not* run.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 Kao rezultat od `e.stopPropagation()`, klik na dugmiće prikazuje samo jednu poruku (iz `<button>`-a) umesto dve (iz `<button>`-a i iz roditeljskog toolbar `<div>`-a). Kliktanje dugmeta nije isto kao kliktanje okružujućeg toolbar-a, tako da zaustavljanje propagacije ima smisla za ovaj UI.
 
@@ -455,19 +433,11 @@ U retkim slučajevima, možete poželeti da uhvatite sve event-e iz dečjih elem
 </div>
 ```
 
-<<<<<<< HEAD
 Svaki event se propagira u tri faze:
 
 1. Putuje na dole, pozivajući sve `onClickCapture` handler-e.
 2. Pokreće `onClick` handler na kliknutom elementu. 
 3. Putuje na gore, pozivajući sve `onClick` handler-e.
-=======
-Each event propagates in three phases:
-
-1. It travels down, calling all `onClickCapture` handlers.
-2. It runs the clicked element's `onClick` handler.
-3. It travels upwards, calling all `onClick` handlers.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 Capture event-i su korisni za rutere i analitiku, ali ih verovatno nećete koristiti u kodu aplikacije.
 
diff --git a/src/content/learn/sharing-state-between-components.md b/src/content/learn/sharing-state-between-components.md
index f47c73c3..afdd7756 100644
--- a/src/content/learn/sharing-state-between-components.md
+++ b/src/content/learn/sharing-state-between-components.md
@@ -323,11 +323,7 @@ Da biste videli kako ovo izgleda u praksi sa nekoliko komponenata, pročitajte [
 
 #### Sinhronizovani input-i {/*synced-inputs*/}
 
-<<<<<<< HEAD
-Ova dva input-a su nezavisna. Sinhronizujte ih: izmena jednog input-a treba da postavi isti tekst u drugi input, i obrnuto. 
-=======
-These two inputs are independent. Make them stay in sync: editing one input should update the other input with the same text, and vice versa.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+Ova dva input-a su nezavisna. Sinhronizujte ih: izmena jednog input-a treba da postavi isti tekst u drugi input, i obrnuto.
 
 <Hint>
 
diff --git a/src/content/learn/state-a-components-memory.md b/src/content/learn/state-a-components-memory.md
index 0e2b51f3..eea1b8f7 100644
--- a/src/content/learn/state-a-components-memory.md
+++ b/src/content/learn/state-a-components-memory.md
@@ -40,19 +40,11 @@ export default function Gallery() {
         Naredno
       </button>
       <h2>
-<<<<<<< HEAD
-        <i>{sculpture.name} </i> 
-        napravio/la {sculpture.artist}
-      </h2>
-      <h3>  
-        ({index + 1} od {sculptureList.length})
-=======
         <i>{sculpture.name} </i>
-        by {sculpture.artist}
+        napravio/la {sculpture.artist}
       </h2>
       <h3>
-        ({index + 1} of {sculptureList.length})
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        ({index + 1} od {sculptureList.length})
       </h3>
       <img
         src={sculpture.url}
@@ -70,147 +62,75 @@ export default function Gallery() {
 export const sculptureList = [{
   name: 'Homenaje a la Neurocirugía',
   artist: 'Marta Colvin Andrade',
-<<<<<<< HEAD
   description: 'Iako je Marta Colvin pretežno poznata po apstraktnim temama koje aludiraju na pre-hispanske simbole, ova velika skulptura, koja je omaž neurohirurgiji, jedna je od njenih najpoznatijih remek dela.',
-  url: 'https://i.imgur.com/Mx7dA2Y.jpg',
-  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'  
+  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
+  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'
 }, {
   name: 'Floralis Genérica',
   artist: 'Eduardo Catalano',
   description: 'Ovaj ogromni (75 ft. ili 23m) srebrni cvet se nalazi u Buenos Ajresu. Dizajniran je da se pomera, zatvarajući svoje latice uveče ili kada duvaju jaki vetrovi, a otvarajući ih ujutru.',
-  url: 'https://i.imgur.com/ZF6s192m.jpg',
+  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
   alt: 'Velika metalna skulptura cveta sa reflektujućim laticama nalik na ogledalo i snažnim prašnicima.'
 }, {
   name: 'Eternal Presence',
   artist: 'John Woodrow Wilson',
   description: 'Wilson je poznat po svojoj preokupiranosti jednakošću, socijalnom pravdom, kao i suštinskim i duhovnim kvalitetima čovečanstva. Ova masivna (7ft. ili 2,13m) bronzana skulptura predstavlja ono što je on objasnio kao "simbolično crno prisustvo prožeto osećajem univerzalne humanosti".',
-  url: 'https://i.imgur.com/aTtVpES.jpg',
+  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
   alt: 'Skulptura ljudske glave koja deluje sveprisutno i svečano. Zrači mirnoćom i spokojstvom.'
 }, {
   name: 'Moai',
   artist: 'Nepoznati umetnik',
   description: 'Nalazi se na Uskršnjem ostrvu, gde postoji oko 1,000 moai očuvanih monumentalnih skulptura, koje su napravili prvobitni Rapa Nui ljudi, za koje se veruje da predstavljaju pretke Bogova.',
-  url: 'https://i.imgur.com/RCwLEoQm.jpg',
+  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
   alt: 'Tri monumentalne biste sa neproporcionalno velikim glavama i namrštenim licima.'
 }, {
   name: 'Blue Nana',
   artist: 'Niki de Saint Phalle',
   description: 'Nane su trijumfalna stvorenja, simboli ženstvenosti i majčinstva. Inicijalno, Saint Phalle je koristila tkaninu i pronađene objekte za Nane, ali je kasnije uvela poliester kako bi napravila živopisniji dojam.',
-  url: 'https://i.imgur.com/Sd1AgUOm.jpg',
+  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
   alt: 'Velika mozaička skulptura neobične ženske figure u raznobojnom kostimu koji odiše radošću.'
 }, {
   name: 'Ultimate Form',
   artist: 'Barbara Hepworth',
   description: 'Ova apstraktna bronzana skulptura je deo The Family of Man serije koja se nalazi u Jorkširskom parku skulptura. Hepworth je odlučila da ne pravi bukvalne reprezentacije sveta, već apstraktne forme inspirisane ljudima i pejzažima.',
-  url: 'https://i.imgur.com/2heNQDcm.jpg',
+  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
   alt: 'Visoka skulptura tri elementa jedna na drugom koja podseća na ljudsku figuru.'
 }, {
   name: 'Cavaliere',
   artist: 'Lamidi Olonade Fakeye',
   description: "Pošto potiče od četiri generacije drvorezbara, Fakeye-ova dela su mešavina tradicionalne i savremene Joruba tematike.",
-  url: 'https://i.imgur.com/wIdGuZwm.png',
+  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.jpg',
   alt: 'Složena drvena skulptura ratnika čije lice je fokusirano na konja ukrašenim šarama.'
 }, {
   name: 'Big Bellies',
   artist: 'Alina Szapocznikow',
   description: "Alina je poznata po skulpturama izdeljenog tela kao metafore za krhkost i nestalnost mladosti i lepote. Ova skulptura prikazuje dva veoma realistična velika stomaka jednog na drugom, gde je svaki visok oko 5 stopa (1,5m).",
-  url: 'https://i.imgur.com/AlHTAdDm.jpg',
+  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
   alt: 'Ova skulptura podseća na slapove nabora i dosta se razlikuje od stomaka na klasičnim skulpturama.'
 }, {
   name: 'Terracotta Army',
   artist: 'Nepoznati umetnik',
   description: 'Terracotta Army je kolekcija terakota skulptura koje predstavljaju armiju Qin Shi Huang-a, prvog cara Kine. Armija se sastojala od preko 8,000 vojnika, 130 kola sa 520 konja i 150 članova konjice.',
-  url: 'https://i.imgur.com/HMFmH6m.jpg',
+  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
   alt: '12 terakota skulptura svečanih vojnika, od kojih svaki ima jedinstvenu facijalnu ekspresiju i oklop.'
 }, {
   name: 'Lunar Landscape',
   artist: 'Louise Nevelson',
   description: 'Nevelson je poznata po uklanjanju objekata iz ruševina Njujorka, od kojih je kasnije pravila monumentalne konstrukcije. Za ovo je koristila rasparene delove poput noge od kreveta, palice za žongliranje i delove sedišta, zakucavajući ih i lepeći u kutije koje podsećaju na kubističku geometrijsku apstrakciju prostora i forme.',
-  url: 'https://i.imgur.com/rN7hY6om.jpg',
+  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
   alt: 'Crna mat skulptura gde su pojedinačni delovi na početku bili neprimetni.'
 }, {
   name: 'Aureole',
   artist: 'Ranjani Shettar',
   description: 'Shettar spaja tradicionalno i moderno, prirodno i industrijsko. Njena umetnost se fokusira na vezu između čoveka i prirode. Njen rad se opisuje kao ubedljiv i apstraktno i figurativno, prokoseći gravitaciji, kao i "dobra sinteza neobičnih materijala".',
-  url: 'https://i.imgur.com/okTpbHhm.jpg',
+  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
   alt: 'Bleda skulptura nalik na žicu postavljena na betonski zid spuštajući se na pod. Izgleda lako.'
 }, {
   name: 'Hippos',
   artist: 'Taipei Zoo',
   description: 'Zoološki vrt u Tajpeju je naručio trg nilskih konja koji se igraju zaronjeni.',
-  url: 'https://i.imgur.com/6o5Vuyu.jpg',
-  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
-=======
-  description: 'Although Colvin is predominantly known for abstract themes that allude to pre-Hispanic symbols, this gigantic sculpture, an homage to neurosurgery, is one of her most recognizable public art pieces.',
-  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
-  alt: 'A bronze statue of two crossed hands delicately holding a human brain in their fingertips.'
-}, {
-  name: 'Floralis Genérica',
-  artist: 'Eduardo Catalano',
-  description: 'This enormous (75 ft. or 23m) silver flower is located in Buenos Aires. It is designed to move, closing its petals in the evening or when strong winds blow and opening them in the morning.',
-  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
-  alt: 'A gigantic metallic flower sculpture with reflective mirror-like petals and strong stamens.'
-}, {
-  name: 'Eternal Presence',
-  artist: 'John Woodrow Wilson',
-  description: 'Wilson was known for his preoccupation with equality, social justice, as well as the essential and spiritual qualities of humankind. This massive (7ft. or 2,13m) bronze represents what he described as "a symbolic Black presence infused with a sense of universal humanity."',
-  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
-  alt: 'The sculpture depicting a human head seems ever-present and solemn. It radiates calm and serenity.'
-}, {
-  name: 'Moai',
-  artist: 'Unknown Artist',
-  description: 'Located on the Easter Island, there are 1,000 moai, or extant monumental statues, created by the early Rapa Nui people, which some believe represented deified ancestors.',
-  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
-  alt: 'Three monumental stone busts with the heads that are disproportionately large with somber faces.'
-}, {
-  name: 'Blue Nana',
-  artist: 'Niki de Saint Phalle',
-  description: 'The Nanas are triumphant creatures, symbols of femininity and maternity. Initially, Saint Phalle used fabric and found objects for the Nanas, and later on introduced polyester to achieve a more vibrant effect.',
-  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
-  alt: 'A large mosaic sculpture of a whimsical dancing female figure in a colorful costume emanating joy.'
-}, {
-  name: 'Ultimate Form',
-  artist: 'Barbara Hepworth',
-  description: 'This abstract bronze sculpture is a part of The Family of Man series located at Yorkshire Sculpture Park. Hepworth chose not to create literal representations of the world but developed abstract forms inspired by people and landscapes.',
-  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
-  alt: 'A tall sculpture made of three elements stacked on each other reminding of a human figure.'
-}, {
-  name: 'Cavaliere',
-  artist: 'Lamidi Olonade Fakeye',
-  description: "Descended from four generations of woodcarvers, Fakeye's work blended traditional and contemporary Yoruba themes.",
-  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.png',
-  alt: 'An intricate wood sculpture of a warrior with a focused face on a horse adorned with patterns.'
-}, {
-  name: 'Big Bellies',
-  artist: 'Alina Szapocznikow',
-  description: "Szapocznikow is known for her sculptures of the fragmented body as a metaphor for the fragility and impermanence of youth and beauty. This sculpture depicts two very realistic large bellies stacked on top of each other, each around five feet (1,5m) tall.",
-  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
-  alt: 'The sculpture reminds a cascade of folds, quite different from bellies in classical sculptures.'
-}, {
-  name: 'Terracotta Army',
-  artist: 'Unknown Artist',
-  description: 'The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.',
-  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
-  alt: '12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor.'
-}, {
-  name: 'Lunar Landscape',
-  artist: 'Louise Nevelson',
-  description: 'Nevelson was known for scavenging objects from New York City debris, which she would later assemble into monumental constructions. In this one, she used disparate parts like a bedpost, juggling pin, and seat fragment, nailing and gluing them into boxes that reflect the influence of Cubism’s geometric abstraction of space and form.',
-  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
-  alt: 'A black matte sculpture where the individual elements are initially indistinguishable.'
-}, {
-  name: 'Aureole',
-  artist: 'Ranjani Shettar',
-  description: 'Shettar merges the traditional and the modern, the natural and the industrial. Her art focuses on the relationship between man and nature. Her work was described as compelling both abstractly and figuratively, gravity defying, and a "fine synthesis of unlikely materials."',
-  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
-  alt: 'A pale wire-like sculpture mounted on concrete wall and descending on the floor. It appears light.'
-}, {
-  name: 'Hippos',
-  artist: 'Taipei Zoo',
-  description: 'The Taipei Zoo commissioned a Hippo Square featuring submerged hippos at play.',
   url: 'https://react.dev/images/docs/scientists/6o5Vuyu.jpg',
-  alt: 'A group of bronze hippo sculptures emerging from the sett sidewalk as if they were swimming.'
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
 }];
 ```
 
@@ -300,19 +220,11 @@ export default function Gallery() {
         Naredno
       </button>
       <h2>
-<<<<<<< HEAD
-        <i>{sculpture.name} </i> 
-        napravio/la {sculpture.artist}
-      </h2>
-      <h3>  
-        ({index + 1} od {sculptureList.length})
-=======
         <i>{sculpture.name} </i>
-        by {sculpture.artist}
+        napravio/la {sculpture.artist}
       </h2>
       <h3>
-        ({index + 1} of {sculptureList.length})
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        ({index + 1} od {sculptureList.length})
       </h3>
       <img
         src={sculpture.url}
@@ -330,147 +242,75 @@ export default function Gallery() {
 export const sculptureList = [{
   name: 'Homenaje a la Neurocirugía',
   artist: 'Marta Colvin Andrade',
-<<<<<<< HEAD
   description: 'Iako je Marta Colvin pretežno poznata po apstraktnim temama koje aludiraju na pre-hispanske simbole, ova ogromna skulptura, koja je omaž neurohirurgiji, jedna je od njenih najpoznatijih remek dela.',
-  url: 'https://i.imgur.com/Mx7dA2Y.jpg',
-  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'  
+  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
+  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'
 }, {
   name: 'Floralis Genérica',
   artist: 'Eduardo Catalano',
   description: 'Ovaj ogromni (75 ft. ili 23m) srebrni cvet se nalazi u Buenos Ajresu. Dizajniran je da se pomera, zatvarajući svoje latice uveče ili kada duvaju jaki vetrovi, a otvarajući ih ujutru.',
-  url: 'https://i.imgur.com/ZF6s192m.jpg',
+  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
   alt: 'Velika metalna skulptura cveta sa reflektujućim laticama nalik na ogledalo i snažnim prašnicima.'
 }, {
   name: 'Eternal Presence',
   artist: 'John Woodrow Wilson',
   description: 'Wilson je poznat po svojoj preokupiranosti jednakošću, socijalnom pravdom, kao i suštinskim i duhovnim kvalitetima čovečanstva. Ova masivna (7ft. ili 2,13m) bronzana skulptura predstavlja ono što je on objasnio kao "simbolično crno prisustvo prožeto osećajem univerzalne humanosti".',
-  url: 'https://i.imgur.com/aTtVpES.jpg',
+  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
   alt: 'Skulptura ljudske glave koja deluje sveprisutno i svečano. Zrači mirnoćom i spokojstvom.'
 }, {
   name: 'Moai',
   artist: 'Nepoznati umetnik',
   description: 'Nalazi se na Uskršnjem ostrvu, gde postoji oko 1,000 moai očuvanih monumentalnih skulptura, koje su napravili prvobitni Rapa Nui ljudi, za koje se veruje da predstavljaju pretke Bogova.',
-  url: 'https://i.imgur.com/RCwLEoQm.jpg',
+  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
   alt: 'Tri monumentalne biste sa neproporcionalno velikim glavama i namrštenim licima.'
 }, {
   name: 'Blue Nana',
   artist: 'Niki de Saint Phalle',
   description: 'Nane su trijumfalna stvorenja, simboli ženstvenosti i majčinstva. Inicijalno, Saint Phalle je koristila tkaninu i pronađene objekte za Nane, ali je kasnije uvela poliester kako bi napravila živopisniji dojam.',
-  url: 'https://i.imgur.com/Sd1AgUOm.jpg',
+  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
   alt: 'Velika mozaička skulptura neobične ženske figure u raznobojnom kostimu koji odiše radošću.'
 }, {
   name: 'Ultimate Form',
   artist: 'Barbara Hepworth',
   description: 'Ova apstraktna bronzana skulptura je deo The Family of Man serije koja se nalazi u Jorkširskom parku skulptura. Hepworth je odlučila da ne pravi bukvalne reprezentacije sveta, već apstraktne forme inspirisane ljudima i pejzažima.',
-  url: 'https://i.imgur.com/2heNQDcm.jpg',
+  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
   alt: 'Visoka skulptura tri elementa jedna na drugom koja podseća na ljudsku figuru.'
 }, {
   name: 'Cavaliere',
   artist: 'Lamidi Olonade Fakeye',
   description: "Pošto potiče od četiri generacije drvorezbara, Fakeye-ova dela su mešavina tradicionalne i savremene Joruba tematike.",
-  url: 'https://i.imgur.com/wIdGuZwm.png',
+  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.jpg',
   alt: 'Složena drvena skulptura ratnika čije lice je fokusirano na konja ukrašenim šarama.'
 }, {
   name: 'Big Bellies',
   artist: 'Alina Szapocznikow',
   description: "Alina je poznata po skulpturama izdeljenog tela kao metafore za krhkost i nestalnost mladosti i lepote. Ova skulptura prikazuje dva veoma realistična velika stomaka jednog na drugom, gde je svaki visok oko 5 stopa (1,5m).",
-  url: 'https://i.imgur.com/AlHTAdDm.jpg',
+  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
   alt: 'Ova skulptura podseća na slapove nabora i dosta se razlikuje od stomaka na klasičnim skulpturama.'
 }, {
   name: 'Terracotta Army',
   artist: 'Nepoznati umetnik',
   description: 'Terracotta Army je kolekcija terakota skulptura koje predstavljaju armiju Qin Shi Huang-a, prvog cara Kine. Armija se sastojala od preko 8,000 vojnika, 130 kola sa 520 konja i 150 članova konjice.',
-  url: 'https://i.imgur.com/HMFmH6m.jpg',
+  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
   alt: '12 terakota skulptura svečanih vojnika, od kojih svaki ima jedinstvenu facijalnu ekspresiju i oklop.'
 }, {
   name: 'Lunar Landscape',
   artist: 'Louise Nevelson',
   description: 'Nevelson je poznata po uklanjanju objekata iz ruševina Njujorka, od kojih je kasnije pravila monumentalne konstrukcije. Za ovo je koristila rasparene delove poput noge od kreveta, palice za žongliranje i delove sedišta, zakucavajući ih i lepeći u kutije koje podsećaju na kubističku geometrijsku apstrakciju prostora i forme.',
-  url: 'https://i.imgur.com/rN7hY6om.jpg',
+  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
   alt: 'Crna mat skulptura gde su pojedinačni delovi na početku bili neprimetni.'
 }, {
   name: 'Aureole',
   artist: 'Ranjani Shettar',
   description: 'Shettar spaja tradicionalno i moderno, prirodno i industrijsko. Njena umetnost se fokusira na vezu između čoveka i prirode. Njen rad se opisuje kao ubedljiv i apstraktno i figurativno, prokoseći gravitaciji, kao i "dobra sinteza neobičnih materijala".',
-  url: 'https://i.imgur.com/okTpbHhm.jpg',
+  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
   alt: 'Bleda skulptura nalik na žicu postavljena na betonski zid spuštajući se na pod. Izgleda lako.'
 }, {
   name: 'Hippos',
   artist: 'Taipei Zoo',
   description: 'Zoološki vrt u Tajpeju je naručio trg nilskih konja koji se igraju zaronjeni.',
-  url: 'https://i.imgur.com/6o5Vuyu.jpg',
-  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
-=======
-  description: 'Although Colvin is predominantly known for abstract themes that allude to pre-Hispanic symbols, this gigantic sculpture, an homage to neurosurgery, is one of her most recognizable public art pieces.',
-  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
-  alt: 'A bronze statue of two crossed hands delicately holding a human brain in their fingertips.'
-}, {
-  name: 'Floralis Genérica',
-  artist: 'Eduardo Catalano',
-  description: 'This enormous (75 ft. or 23m) silver flower is located in Buenos Aires. It is designed to move, closing its petals in the evening or when strong winds blow and opening them in the morning.',
-  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
-  alt: 'A gigantic metallic flower sculpture with reflective mirror-like petals and strong stamens.'
-}, {
-  name: 'Eternal Presence',
-  artist: 'John Woodrow Wilson',
-  description: 'Wilson was known for his preoccupation with equality, social justice, as well as the essential and spiritual qualities of humankind. This massive (7ft. or 2,13m) bronze represents what he described as "a symbolic Black presence infused with a sense of universal humanity."',
-  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
-  alt: 'The sculpture depicting a human head seems ever-present and solemn. It radiates calm and serenity.'
-}, {
-  name: 'Moai',
-  artist: 'Unknown Artist',
-  description: 'Located on the Easter Island, there are 1,000 moai, or extant monumental statues, created by the early Rapa Nui people, which some believe represented deified ancestors.',
-  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
-  alt: 'Three monumental stone busts with the heads that are disproportionately large with somber faces.'
-}, {
-  name: 'Blue Nana',
-  artist: 'Niki de Saint Phalle',
-  description: 'The Nanas are triumphant creatures, symbols of femininity and maternity. Initially, Saint Phalle used fabric and found objects for the Nanas, and later on introduced polyester to achieve a more vibrant effect.',
-  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
-  alt: 'A large mosaic sculpture of a whimsical dancing female figure in a colorful costume emanating joy.'
-}, {
-  name: 'Ultimate Form',
-  artist: 'Barbara Hepworth',
-  description: 'This abstract bronze sculpture is a part of The Family of Man series located at Yorkshire Sculpture Park. Hepworth chose not to create literal representations of the world but developed abstract forms inspired by people and landscapes.',
-  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
-  alt: 'A tall sculpture made of three elements stacked on each other reminding of a human figure.'
-}, {
-  name: 'Cavaliere',
-  artist: 'Lamidi Olonade Fakeye',
-  description: "Descended from four generations of woodcarvers, Fakeye's work blended traditional and contemporary Yoruba themes.",
-  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.png',
-  alt: 'An intricate wood sculpture of a warrior with a focused face on a horse adorned with patterns.'
-}, {
-  name: 'Big Bellies',
-  artist: 'Alina Szapocznikow',
-  description: "Szapocznikow is known for her sculptures of the fragmented body as a metaphor for the fragility and impermanence of youth and beauty. This sculpture depicts two very realistic large bellies stacked on top of each other, each around five feet (1,5m) tall.",
-  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
-  alt: 'The sculpture reminds a cascade of folds, quite different from bellies in classical sculptures.'
-}, {
-  name: 'Terracotta Army',
-  artist: 'Unknown Artist',
-  description: 'The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.',
-  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
-  alt: '12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor.'
-}, {
-  name: 'Lunar Landscape',
-  artist: 'Louise Nevelson',
-  description: 'Nevelson was known for scavenging objects from New York City debris, which she would later assemble into monumental constructions. In this one, she used disparate parts like a bedpost, juggling pin, and seat fragment, nailing and gluing them into boxes that reflect the influence of Cubism’s geometric abstraction of space and form.',
-  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
-  alt: 'A black matte sculpture where the individual elements are initially indistinguishable.'
-}, {
-  name: 'Aureole',
-  artist: 'Ranjani Shettar',
-  description: 'Shettar merges the traditional and the modern, the natural and the industrial. Her art focuses on the relationship between man and nature. Her work was described as compelling both abstractly and figuratively, gravity defying, and a "fine synthesis of unlikely materials."',
-  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
-  alt: 'A pale wire-like sculpture mounted on concrete wall and descending on the floor. It appears light.'
-}, {
-  name: 'Hippos',
-  artist: 'Taipei Zoo',
-  description: 'The Taipei Zoo commissioned a Hippo Square featuring submerged hippos at play.',
   url: 'https://react.dev/images/docs/scientists/6o5Vuyu.jpg',
-  alt: 'A group of bronze hippo sculptures emerging from the sett sidewalk as if they were swimming.'
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
 }];
 ```
 
@@ -521,11 +361,7 @@ Konvencija je da se par nazove ovako `const [something, setSomething]`. Možete
 
 </Note>
 
-<<<<<<< HEAD
-Jedini argument u `useState` je **inicijalna vrednost** vaše state promenljive. U ovom primeru, inicijalna vrednost `index`-a je postavljena na `0` sa `useState(0)`. 
-=======
-The only argument to `useState` is the **initial value** of your state variable. In this example, the `index`'s initial value is set to `0` with `useState(0)`.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+Jedini argument u `useState` je **inicijalna vrednost** vaše state promenljive. U ovom primeru, inicijalna vrednost `index`-a je postavljena na `0` sa `useState(0)`.
 
 Svaki put kad se komponenta renderuje, `useState` vam daje niz koji sadrži dve vrednosti:
 
@@ -572,19 +408,11 @@ export default function Gallery() {
         Naredno
       </button>
       <h2>
-<<<<<<< HEAD
-        <i>{sculpture.name} </i> 
-        napravio/la {sculpture.artist}
-      </h2>
-      <h3>  
-        ({index + 1} od {sculptureList.length})
-=======
         <i>{sculpture.name} </i>
-        by {sculpture.artist}
+        napravio/la {sculpture.artist}
       </h2>
       <h3>
-        ({index + 1} of {sculptureList.length})
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        ({index + 1} od {sculptureList.length})
       </h3>
       <button onClick={handleMoreClick}>
         {showMore ? 'Sakrij' : 'Prikaži'} detalje
@@ -603,147 +431,75 @@ export default function Gallery() {
 export const sculptureList = [{
   name: 'Homenaje a la Neurocirugía',
   artist: 'Marta Colvin Andrade',
-<<<<<<< HEAD
   description: 'Iako je Marta Colvin pretežno poznata po apstraktnim temama koje aludiraju na pre-hispanske simbole, ova ogromna skulptura, koja je omaž neurohirurgiji, jedna je od njenih najpoznatijih remek dela.',
-  url: 'https://i.imgur.com/Mx7dA2Y.jpg',
-  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'  
+  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
+  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'
 }, {
   name: 'Floralis Genérica',
   artist: 'Eduardo Catalano',
   description: 'Ovaj ogromni (75 ft. ili 23m) srebrni cvet se nalazi u Buenos Ajresu. Dizajniran je da se pomera, zatvarajući svoje latice uveče ili kada duvaju jaki vetrovi, a otvarajući ih ujutru.',
-  url: 'https://i.imgur.com/ZF6s192m.jpg',
+  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
   alt: 'Velika metalna skulptura cveta sa reflektujućim laticama nalik na ogledalo i snažnim prašnicima.'
 }, {
   name: 'Eternal Presence',
   artist: 'John Woodrow Wilson',
   description: 'Wilson je poznat po svojoj preokupiranosti jednakošću, socijalnom pravdom, kao i suštinskim i duhovnim kvalitetima čovečanstva. Ova masivna (7ft. ili 2,13m) bronzana skulptura predstavlja ono što je on objasnio kao "simbolično crno prisustvo prožeto osećajem univerzalne humanosti".',
-  url: 'https://i.imgur.com/aTtVpES.jpg',
+  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
   alt: 'Skulptura ljudske glave koja deluje sveprisutno i svečano. Zrači mirnoćom i spokojstvom.'
 }, {
   name: 'Moai',
   artist: 'Nepoznati umetnik',
   description: 'Nalazi se na Uskršnjem ostrvu, gde postoji oko 1,000 moai očuvanih monumentalnih skulptura, koje su napravili prvobitni Rapa Nui ljudi, za koje se veruje da predstavljaju pretke Bogova.',
-  url: 'https://i.imgur.com/RCwLEoQm.jpg',
+  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
   alt: 'Tri monumentalne biste sa neproporcionalno velikim glavama i namrštenim licima.'
 }, {
   name: 'Blue Nana',
   artist: 'Niki de Saint Phalle',
   description: 'Nane su trijumfalna stvorenja, simboli ženstvenosti i majčinstva. Inicijalno, Saint Phalle je koristila tkaninu i pronađene objekte za Nane, ali je kasnije uvela poliester kako bi napravila živopisniji dojam.',
-  url: 'https://i.imgur.com/Sd1AgUOm.jpg',
+  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
   alt: 'Velika mozaička skulptura neobične ženske figure u raznobojnom kostimu koji odiše radošću.'
 }, {
   name: 'Ultimate Form',
   artist: 'Barbara Hepworth',
   description: 'Ova apstraktna bronzana skulptura je deo The Family of Man serije koja se nalazi u Jorkširskom parku skulptura. Hepworth je odlučila da ne pravi bukvalne reprezentacije sveta, već apstraktne forme inspirisane ljudima i pejzažima.',
-  url: 'https://i.imgur.com/2heNQDcm.jpg',
+  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
   alt: 'Visoka skulptura tri elementa jedna na drugom koja podseća na ljudsku figuru.'
 }, {
   name: 'Cavaliere',
   artist: 'Lamidi Olonade Fakeye',
   description: "Pošto potiče od četiri generacije drvorezbara, Fakeye-ova dela su mešavina tradicionalne i savremene Joruba tematike.",
-  url: 'https://i.imgur.com/wIdGuZwm.png',
+  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.jpg',
   alt: 'Složena drvena skulptura ratnika čije lice je fokusirano na konja ukrašenim šarama.'
 }, {
   name: 'Big Bellies',
   artist: 'Alina Szapocznikow',
   description: "Alina je poznata po skulpturama izdeljenog tela kao metafore za krhkost i nestalnost mladosti i lepote. Ova skulptura prikazuje dva veoma realistična velika stomaka jednog na drugom, gde je svaki visok oko 5 stopa (1,5m).",
-  url: 'https://i.imgur.com/AlHTAdDm.jpg',
+  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
   alt: 'Ova skulptura podseća na slapove nabora i dosta se razlikuje od stomaka na klasičnim skulpturama.'
 }, {
   name: 'Terracotta Army',
   artist: 'Nepoznati umetnik',
   description: 'Terracotta Army je kolekcija terakota skulptura koje predstavljaju armiju Qin Shi Huang-a, prvog cara Kine. Armija se sastojala od preko 8,000 vojnika, 130 kola sa 520 konja i 150 članova konjice.',
-  url: 'https://i.imgur.com/HMFmH6m.jpg',
+  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
   alt: '12 terakota skulptura svečanih vojnika, od kojih svaki ima jedinstvenu facijalnu ekspresiju i oklop.'
 }, {
   name: 'Lunar Landscape',
   artist: 'Louise Nevelson',
   description: 'Nevelson je poznata po uklanjanju objekata iz ruševina Njujorka, od kojih je kasnije pravila monumentalne konstrukcije. Za ovo je koristila rasparene delove poput noge od kreveta, palice za žongliranje i delove sedišta, zakucavajući ih i lepeći u kutije koje podsećaju na kubističku geometrijsku apstrakciju prostora i forme.',
-  url: 'https://i.imgur.com/rN7hY6om.jpg',
+  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
   alt: 'Crna mat skulptura gde su pojedinačni delovi na početku bili neprimetni.'
 }, {
   name: 'Aureole',
   artist: 'Ranjani Shettar',
   description: 'Shettar spaja tradicionalno i moderno, prirodno i industrijsko. Njena umetnost se fokusira na vezu između čoveka i prirode. Njen rad se opisuje kao ubedljiv i apstraktno i figurativno, prokoseći gravitaciji, kao i "dobra sinteza neobičnih materijala".',
-  url: 'https://i.imgur.com/okTpbHhm.jpg',
+  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
   alt: 'Bleda skulptura nalik na žicu postavljena na betonski zid spuštajući se na pod. Izgleda lako.'
 }, {
   name: 'Hippos',
   artist: 'Taipei Zoo',
   description: 'Zoološki vrt u Tajpeju je naručio trg nilskih konja koji se igraju zaronjeni.',
-  url: 'https://i.imgur.com/6o5Vuyu.jpg',
-  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
-=======
-  description: 'Although Colvin is predominantly known for abstract themes that allude to pre-Hispanic symbols, this gigantic sculpture, an homage to neurosurgery, is one of her most recognizable public art pieces.',
-  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
-  alt: 'A bronze statue of two crossed hands delicately holding a human brain in their fingertips.'
-}, {
-  name: 'Floralis Genérica',
-  artist: 'Eduardo Catalano',
-  description: 'This enormous (75 ft. or 23m) silver flower is located in Buenos Aires. It is designed to move, closing its petals in the evening or when strong winds blow and opening them in the morning.',
-  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
-  alt: 'A gigantic metallic flower sculpture with reflective mirror-like petals and strong stamens.'
-}, {
-  name: 'Eternal Presence',
-  artist: 'John Woodrow Wilson',
-  description: 'Wilson was known for his preoccupation with equality, social justice, as well as the essential and spiritual qualities of humankind. This massive (7ft. or 2,13m) bronze represents what he described as "a symbolic Black presence infused with a sense of universal humanity."',
-  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
-  alt: 'The sculpture depicting a human head seems ever-present and solemn. It radiates calm and serenity.'
-}, {
-  name: 'Moai',
-  artist: 'Unknown Artist',
-  description: 'Located on the Easter Island, there are 1,000 moai, or extant monumental statues, created by the early Rapa Nui people, which some believe represented deified ancestors.',
-  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
-  alt: 'Three monumental stone busts with the heads that are disproportionately large with somber faces.'
-}, {
-  name: 'Blue Nana',
-  artist: 'Niki de Saint Phalle',
-  description: 'The Nanas are triumphant creatures, symbols of femininity and maternity. Initially, Saint Phalle used fabric and found objects for the Nanas, and later on introduced polyester to achieve a more vibrant effect.',
-  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
-  alt: 'A large mosaic sculpture of a whimsical dancing female figure in a colorful costume emanating joy.'
-}, {
-  name: 'Ultimate Form',
-  artist: 'Barbara Hepworth',
-  description: 'This abstract bronze sculpture is a part of The Family of Man series located at Yorkshire Sculpture Park. Hepworth chose not to create literal representations of the world but developed abstract forms inspired by people and landscapes.',
-  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
-  alt: 'A tall sculpture made of three elements stacked on each other reminding of a human figure.'
-}, {
-  name: 'Cavaliere',
-  artist: 'Lamidi Olonade Fakeye',
-  description: "Descended from four generations of woodcarvers, Fakeye's work blended traditional and contemporary Yoruba themes.",
-  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.png',
-  alt: 'An intricate wood sculpture of a warrior with a focused face on a horse adorned with patterns.'
-}, {
-  name: 'Big Bellies',
-  artist: 'Alina Szapocznikow',
-  description: "Szapocznikow is known for her sculptures of the fragmented body as a metaphor for the fragility and impermanence of youth and beauty. This sculpture depicts two very realistic large bellies stacked on top of each other, each around five feet (1,5m) tall.",
-  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
-  alt: 'The sculpture reminds a cascade of folds, quite different from bellies in classical sculptures.'
-}, {
-  name: 'Terracotta Army',
-  artist: 'Unknown Artist',
-  description: 'The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.',
-  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
-  alt: '12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor.'
-}, {
-  name: 'Lunar Landscape',
-  artist: 'Louise Nevelson',
-  description: 'Nevelson was known for scavenging objects from New York City debris, which she would later assemble into monumental constructions. In this one, she used disparate parts like a bedpost, juggling pin, and seat fragment, nailing and gluing them into boxes that reflect the influence of Cubism’s geometric abstraction of space and form.',
-  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
-  alt: 'A black matte sculpture where the individual elements are initially indistinguishable.'
-}, {
-  name: 'Aureole',
-  artist: 'Ranjani Shettar',
-  description: 'Shettar merges the traditional and the modern, the natural and the industrial. Her art focuses on the relationship between man and nature. Her work was described as compelling both abstractly and figuratively, gravity defying, and a "fine synthesis of unlikely materials."',
-  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
-  alt: 'A pale wire-like sculpture mounted on concrete wall and descending on the floor. It appears light.'
-}, {
-  name: 'Hippos',
-  artist: 'Taipei Zoo',
-  description: 'The Taipei Zoo commissioned a Hippo Square featuring submerged hippos at play.',
   url: 'https://react.dev/images/docs/scientists/6o5Vuyu.jpg',
-  alt: 'A group of bronze hippo sculptures emerging from the sett sidewalk as if they were swimming.'
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
 }];
 ```
 
@@ -871,147 +627,75 @@ let image = document.getElementById('image');
 let sculptureList = [{
   name: 'Homenaje a la Neurocirugía',
   artist: 'Marta Colvin Andrade',
-<<<<<<< HEAD
   description: 'Iako je Marta Colvin pretežno poznata po apstraktnim temama koje aludiraju na pre-hispanske simbole, ova ogromna skulptura, koja je omaž neurohirurgiji, jedna je od njenih najpoznatijih remek dela.',
-  url: 'https://i.imgur.com/Mx7dA2Y.jpg',
-  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'  
+  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
+  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'
 }, {
   name: 'Floralis Genérica',
   artist: 'Eduardo Catalano',
   description: 'Ovaj ogromni (75 ft. ili 23m) srebrni cvet se nalazi u Buenos Ajresu. Dizajniran je da se pomera, zatvarajući svoje latice uveče ili kada duvaju jaki vetrovi, a otvarajući ih ujutru.',
-  url: 'https://i.imgur.com/ZF6s192m.jpg',
+  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
   alt: 'Velika metalna skulptura cveta sa reflektujućim laticama nalik na ogledalo i snažnim prašnicima.'
 }, {
   name: 'Eternal Presence',
   artist: 'John Woodrow Wilson',
   description: 'Wilson je poznat po svojoj preokupiranosti jednakošću, socijalnom pravdom, kao i suštinskim i duhovnim kvalitetima čovečanstva. Ova masivna (7ft. ili 2,13m) bronzana skulptura predstavlja ono što je on objasnio kao "simbolično crno prisustvo prožeto osećajem univerzalne humanosti".',
-  url: 'https://i.imgur.com/aTtVpES.jpg',
+  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
   alt: 'Skulptura ljudske glave koja deluje sveprisutno i svečano. Zrači mirnoćom i spokojstvom.'
 }, {
   name: 'Moai',
   artist: 'Nepoznati umetnik',
   description: 'Nalazi se na Uskršnjem ostrvu, gde postoji oko 1,000 moai očuvanih monumentalnih skulptura, koje su napravili prvobitni Rapa Nui ljudi, za koje se veruje da predstavljaju pretke Bogova.',
-  url: 'https://i.imgur.com/RCwLEoQm.jpg',
+  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
   alt: 'Tri monumentalne biste sa neproporcionalno velikim glavama i namrštenim licima.'
 }, {
   name: 'Blue Nana',
   artist: 'Niki de Saint Phalle',
   description: 'Nane su trijumfalna stvorenja, simboli ženstvenosti i majčinstva. Inicijalno, Saint Phalle je koristila tkaninu i pronađene objekte za Nane, ali je kasnije uvela poliester kako bi napravila živopisniji dojam.',
-  url: 'https://i.imgur.com/Sd1AgUOm.jpg',
+  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
   alt: 'Velika mozaička skulptura neobične ženske figure u raznobojnom kostimu koji odiše radošću.'
 }, {
   name: 'Ultimate Form',
   artist: 'Barbara Hepworth',
   description: 'Ova apstraktna bronzana skulptura je deo The Family of Man serije koja se nalazi u Jorkširskom parku skulptura. Hepworth je odlučila da ne pravi bukvalne reprezentacije sveta, već apstraktne forme inspirisane ljudima i pejzažima.',
-  url: 'https://i.imgur.com/2heNQDcm.jpg',
+  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
   alt: 'Visoka skulptura tri elementa jedna na drugom koja podseća na ljudsku figuru.'
 }, {
   name: 'Cavaliere',
   artist: 'Lamidi Olonade Fakeye',
   description: "Pošto potiče od četiri generacije drvorezbara, Fakeye-ova dela su mešavina tradicionalne i savremene Joruba tematike.",
-  url: 'https://i.imgur.com/wIdGuZwm.png',
+  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.jpg',
   alt: 'Složena drvena skulptura ratnika čije lice je fokusirano na konja ukrašenim šarama.'
 }, {
   name: 'Big Bellies',
   artist: 'Alina Szapocznikow',
   description: "Alina je poznata po skulpturama izdeljenog tela kao metafore za krhkost i nestalnost mladosti i lepote. Ova skulptura prikazuje dva veoma realistična velika stomaka jednog na drugom, gde je svaki visok oko 5 stopa (1,5m).",
-  url: 'https://i.imgur.com/AlHTAdDm.jpg',
+  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
   alt: 'Ova skulptura podseća na slapove nabora i dosta se razlikuje od stomaka na klasičnim skulpturama.'
 }, {
   name: 'Terracotta Army',
   artist: 'Nepoznati umetnik',
   description: 'Terracotta Army je kolekcija terakota skulptura koje predstavljaju armiju Qin Shi Huang-a, prvog cara Kine. Armija se sastojala od preko 8,000 vojnika, 130 kola sa 520 konja i 150 članova konjice.',
-  url: 'https://i.imgur.com/HMFmH6m.jpg',
+  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
   alt: '12 terakota skulptura svečanih vojnika, od kojih svaki ima jedinstvenu facijalnu ekspresiju i oklop.'
 }, {
   name: 'Lunar Landscape',
   artist: 'Louise Nevelson',
   description: 'Nevelson je poznata po uklanjanju objekata iz ruševina Njujorka, od kojih je kasnije pravila monumentalne konstrukcije. Za ovo je koristila rasparene delove poput noge od kreveta, palice za žongliranje i delove sedišta, zakucavajući ih i lepeći u kutije koje podsećaju na kubističku geometrijsku apstrakciju prostora i forme.',
-  url: 'https://i.imgur.com/rN7hY6om.jpg',
+  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
   alt: 'Crna mat skulptura gde su pojedinačni delovi na početku bili neprimetni.'
 }, {
   name: 'Aureole',
   artist: 'Ranjani Shettar',
   description: 'Shettar spaja tradicionalno i moderno, prirodno i industrijsko. Njena umetnost se fokusira na vezu između čoveka i prirode. Njen rad se opisuje kao ubedljiv i apstraktno i figurativno, prokoseći gravitaciji, kao i "dobra sinteza neobičnih materijala".',
-  url: 'https://i.imgur.com/okTpbHhm.jpg',
+  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
   alt: 'Bleda skulptura nalik na žicu postavljena na betonski zid spuštajući se na pod. Izgleda lako.'
 }, {
   name: 'Hippos',
   artist: 'Taipei Zoo',
   description: 'Zoološki vrt u Tajpeju je naručio trg nilskih konja koji se igraju zaronjeni.',
-  url: 'https://i.imgur.com/6o5Vuyu.jpg',
-  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
-=======
-  description: 'Although Colvin is predominantly known for abstract themes that allude to pre-Hispanic symbols, this gigantic sculpture, an homage to neurosurgery, is one of her most recognizable public art pieces.',
-  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
-  alt: 'A bronze statue of two crossed hands delicately holding a human brain in their fingertips.'
-}, {
-  name: 'Floralis Genérica',
-  artist: 'Eduardo Catalano',
-  description: 'This enormous (75 ft. or 23m) silver flower is located in Buenos Aires. It is designed to move, closing its petals in the evening or when strong winds blow and opening them in the morning.',
-  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
-  alt: 'A gigantic metallic flower sculpture with reflective mirror-like petals and strong stamens.'
-}, {
-  name: 'Eternal Presence',
-  artist: 'John Woodrow Wilson',
-  description: 'Wilson was known for his preoccupation with equality, social justice, as well as the essential and spiritual qualities of humankind. This massive (7ft. or 2,13m) bronze represents what he described as "a symbolic Black presence infused with a sense of universal humanity."',
-  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
-  alt: 'The sculpture depicting a human head seems ever-present and solemn. It radiates calm and serenity.'
-}, {
-  name: 'Moai',
-  artist: 'Unknown Artist',
-  description: 'Located on the Easter Island, there are 1,000 moai, or extant monumental statues, created by the early Rapa Nui people, which some believe represented deified ancestors.',
-  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
-  alt: 'Three monumental stone busts with the heads that are disproportionately large with somber faces.'
-}, {
-  name: 'Blue Nana',
-  artist: 'Niki de Saint Phalle',
-  description: 'The Nanas are triumphant creatures, symbols of femininity and maternity. Initially, Saint Phalle used fabric and found objects for the Nanas, and later on introduced polyester to achieve a more vibrant effect.',
-  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
-  alt: 'A large mosaic sculpture of a whimsical dancing female figure in a colorful costume emanating joy.'
-}, {
-  name: 'Ultimate Form',
-  artist: 'Barbara Hepworth',
-  description: 'This abstract bronze sculpture is a part of The Family of Man series located at Yorkshire Sculpture Park. Hepworth chose not to create literal representations of the world but developed abstract forms inspired by people and landscapes.',
-  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
-  alt: 'A tall sculpture made of three elements stacked on each other reminding of a human figure.'
-}, {
-  name: 'Cavaliere',
-  artist: 'Lamidi Olonade Fakeye',
-  description: "Descended from four generations of woodcarvers, Fakeye's work blended traditional and contemporary Yoruba themes.",
-  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.png',
-  alt: 'An intricate wood sculpture of a warrior with a focused face on a horse adorned with patterns.'
-}, {
-  name: 'Big Bellies',
-  artist: 'Alina Szapocznikow',
-  description: "Szapocznikow is known for her sculptures of the fragmented body as a metaphor for the fragility and impermanence of youth and beauty. This sculpture depicts two very realistic large bellies stacked on top of each other, each around five feet (1,5m) tall.",
-  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
-  alt: 'The sculpture reminds a cascade of folds, quite different from bellies in classical sculptures.'
-}, {
-  name: 'Terracotta Army',
-  artist: 'Unknown Artist',
-  description: 'The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.',
-  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
-  alt: '12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor.'
-}, {
-  name: 'Lunar Landscape',
-  artist: 'Louise Nevelson',
-  description: 'Nevelson was known for scavenging objects from New York City debris, which she would later assemble into monumental constructions. In this one, she used disparate parts like a bedpost, juggling pin, and seat fragment, nailing and gluing them into boxes that reflect the influence of Cubism’s geometric abstraction of space and form.',
-  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
-  alt: 'A black matte sculpture where the individual elements are initially indistinguishable.'
-}, {
-  name: 'Aureole',
-  artist: 'Ranjani Shettar',
-  description: 'Shettar merges the traditional and the modern, the natural and the industrial. Her art focuses on the relationship between man and nature. Her work was described as compelling both abstractly and figuratively, gravity defying, and a "fine synthesis of unlikely materials."',
-  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
-  alt: 'A pale wire-like sculpture mounted on concrete wall and descending on the floor. It appears light.'
-}, {
-  name: 'Hippos',
-  artist: 'Taipei Zoo',
-  description: 'The Taipei Zoo commissioned a Hippo Square featuring submerged hippos at play.',
   url: 'https://react.dev/images/docs/scientists/6o5Vuyu.jpg',
-  alt: 'A group of bronze hippo sculptures emerging from the sett sidewalk as if they were swimming.'
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
 }];
 
 // Učini da UI prikazuje inicijalni state.
@@ -1089,19 +773,11 @@ export default function Gallery() {
         Naredno
       </button>
       <h2>
-<<<<<<< HEAD
-        <i>{sculpture.name} </i> 
-        napravio/la {sculpture.artist}
-      </h2>
-      <h3>  
-        ({index + 1} od {sculptureList.length})
-=======
         <i>{sculpture.name} </i>
-        by {sculpture.artist}
+        napravio/la {sculpture.artist}
       </h2>
       <h3>
-        ({index + 1} of {sculptureList.length})
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        ({index + 1} od {sculptureList.length})
       </h3>
       <button onClick={handleMoreClick}>
         {showMore ? 'Sakrij' : 'Prikaži'} detalje
@@ -1120,147 +796,75 @@ export default function Gallery() {
 export const sculptureList = [{
   name: 'Homenaje a la Neurocirugía',
   artist: 'Marta Colvin Andrade',
-<<<<<<< HEAD
   description: 'Iako je Marta Colvin pretežno poznata po apstraktnim temama koje aludiraju na pre-hispanske simbole, ova ogromna skulptura, koja je omaž neurohirurgiji, jedna je od njenih najpoznatijih remek dela.',
-  url: 'https://i.imgur.com/Mx7dA2Y.jpg',
-  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'  
+  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
+  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'
 }, {
   name: 'Floralis Genérica',
   artist: 'Eduardo Catalano',
   description: 'Ovaj ogromni (75 ft. ili 23m) srebrni cvet se nalazi u Buenos Ajresu. Dizajniran je da se pomera, zatvarajući svoje latice uveče ili kada duvaju jaki vetrovi, a otvarajući ih ujutru.',
-  url: 'https://i.imgur.com/ZF6s192m.jpg',
+  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
   alt: 'Velika metalna skulptura cveta sa reflektujućim laticama nalik na ogledalo i snažnim prašnicima.'
 }, {
   name: 'Eternal Presence',
   artist: 'John Woodrow Wilson',
   description: 'Wilson je poznat po svojoj preokupiranosti jednakošću, socijalnom pravdom, kao i suštinskim i duhovnim kvalitetima čovečanstva. Ova masivna (7ft. ili 2,13m) bronzana skulptura predstavlja ono što je on objasnio kao "simbolično crno prisustvo prožeto osećajem univerzalne humanosti".',
-  url: 'https://i.imgur.com/aTtVpES.jpg',
+  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
   alt: 'Skulptura ljudske glave koja deluje sveprisutno i svečano. Zrači mirnoćom i spokojstvom.'
 }, {
   name: 'Moai',
   artist: 'Nepoznati umetnik',
   description: 'Nalazi se na Uskršnjem ostrvu, gde postoji oko 1,000 moai očuvanih monumentalnih skulptura, koje su napravili prvobitni Rapa Nui ljudi, za koje se veruje da predstavljaju pretke Bogova.',
-  url: 'https://i.imgur.com/RCwLEoQm.jpg',
+  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
   alt: 'Tri monumentalne biste sa neproporcionalno velikim glavama i namrštenim licima.'
 }, {
   name: 'Blue Nana',
   artist: 'Niki de Saint Phalle',
   description: 'Nane su trijumfalna stvorenja, simboli ženstvenosti i majčinstva. Inicijalno, Saint Phalle je koristila tkaninu i pronađene objekte za Nane, ali je kasnije uvela poliester kako bi napravila živopisniji dojam.',
-  url: 'https://i.imgur.com/Sd1AgUOm.jpg',
+  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
   alt: 'Velika mozaička skulptura neobične ženske figure u raznobojnom kostimu koji odiše radošću.'
 }, {
   name: 'Ultimate Form',
   artist: 'Barbara Hepworth',
   description: 'Ova apstraktna bronzana skulptura je deo The Family of Man serije koja se nalazi u Jorkširskom parku skulptura. Hepworth je odlučila da ne pravi bukvalne reprezentacije sveta, već apstraktne forme inspirisane ljudima i pejzažima.',
-  url: 'https://i.imgur.com/2heNQDcm.jpg',
+  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
   alt: 'Visoka skulptura tri elementa jedna na drugom koja podseća na ljudsku figuru.'
 }, {
   name: 'Cavaliere',
   artist: 'Lamidi Olonade Fakeye',
   description: "Pošto potiče od četiri generacije drvorezbara, Fakeye-ova dela su mešavina tradicionalne i savremene Joruba tematike.",
-  url: 'https://i.imgur.com/wIdGuZwm.png',
+  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.jpg',
   alt: 'Složena drvena skulptura ratnika čije lice je fokusirano na konja ukrašenim šarama.'
 }, {
   name: 'Big Bellies',
   artist: 'Alina Szapocznikow',
   description: "Alina je poznata po skulpturama izdeljenog tela kao metafore za krhkost i nestalnost mladosti i lepote. Ova skulptura prikazuje dva veoma realistična velika stomaka jednog na drugom, gde je svaki visok oko 5 stopa (1,5m).",
-  url: 'https://i.imgur.com/AlHTAdDm.jpg',
+  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
   alt: 'Ova skulptura podseća na slapove nabora i dosta se razlikuje od stomaka na klasičnim skulpturama.'
 }, {
   name: 'Terracotta Army',
   artist: 'Nepoznati umetnik',
   description: 'Terracotta Army je kolekcija terakota skulptura koje predstavljaju armiju Qin Shi Huang-a, prvog cara Kine. Armija se sastojala od preko 8,000 vojnika, 130 kola sa 520 konja i 150 članova konjice.',
-  url: 'https://i.imgur.com/HMFmH6m.jpg',
+  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
   alt: '12 terakota skulptura svečanih vojnika, od kojih svaki ima jedinstvenu facijalnu ekspresiju i oklop.'
 }, {
   name: 'Lunar Landscape',
   artist: 'Louise Nevelson',
   description: 'Nevelson je poznata po uklanjanju objekata iz ruševina Njujorka, od kojih je kasnije pravila monumentalne konstrukcije. Za ovo je koristila rasparene delove poput noge od kreveta, palice za žongliranje i delove sedišta, zakucavajući ih i lepeći u kutije koje podsećaju na kubističku geometrijsku apstrakciju prostora i forme.',
-  url: 'https://i.imgur.com/rN7hY6om.jpg',
+  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
   alt: 'Crna mat skulptura gde su pojedinačni delovi na početku bili neprimetni.'
 }, {
   name: 'Aureole',
   artist: 'Ranjani Shettar',
   description: 'Shettar spaja tradicionalno i moderno, prirodno i industrijsko. Njena umetnost se fokusira na vezu između čoveka i prirode. Njen rad se opisuje kao ubedljiv i apstraktno i figurativno, prokoseći gravitaciji, kao i "dobra sinteza neobičnih materijala".',
-  url: 'https://i.imgur.com/okTpbHhm.jpg',
+  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
   alt: 'Bleda skulptura nalik na žicu postavljena na betonski zid spuštajući se na pod. Izgleda lako.'
 }, {
   name: 'Hippos',
   artist: 'Taipei Zoo',
   description: 'Zoološki vrt u Tajpeju je naručio trg nilskih konja koji se igraju zaronjeni.',
-  url: 'https://i.imgur.com/6o5Vuyu.jpg',
-  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
-=======
-  description: 'Although Colvin is predominantly known for abstract themes that allude to pre-Hispanic symbols, this gigantic sculpture, an homage to neurosurgery, is one of her most recognizable public art pieces.',
-  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
-  alt: 'A bronze statue of two crossed hands delicately holding a human brain in their fingertips.'
-}, {
-  name: 'Floralis Genérica',
-  artist: 'Eduardo Catalano',
-  description: 'This enormous (75 ft. or 23m) silver flower is located in Buenos Aires. It is designed to move, closing its petals in the evening or when strong winds blow and opening them in the morning.',
-  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
-  alt: 'A gigantic metallic flower sculpture with reflective mirror-like petals and strong stamens.'
-}, {
-  name: 'Eternal Presence',
-  artist: 'John Woodrow Wilson',
-  description: 'Wilson was known for his preoccupation with equality, social justice, as well as the essential and spiritual qualities of humankind. This massive (7ft. or 2,13m) bronze represents what he described as "a symbolic Black presence infused with a sense of universal humanity."',
-  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
-  alt: 'The sculpture depicting a human head seems ever-present and solemn. It radiates calm and serenity.'
-}, {
-  name: 'Moai',
-  artist: 'Unknown Artist',
-  description: 'Located on the Easter Island, there are 1,000 moai, or extant monumental statues, created by the early Rapa Nui people, which some believe represented deified ancestors.',
-  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
-  alt: 'Three monumental stone busts with the heads that are disproportionately large with somber faces.'
-}, {
-  name: 'Blue Nana',
-  artist: 'Niki de Saint Phalle',
-  description: 'The Nanas are triumphant creatures, symbols of femininity and maternity. Initially, Saint Phalle used fabric and found objects for the Nanas, and later on introduced polyester to achieve a more vibrant effect.',
-  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
-  alt: 'A large mosaic sculpture of a whimsical dancing female figure in a colorful costume emanating joy.'
-}, {
-  name: 'Ultimate Form',
-  artist: 'Barbara Hepworth',
-  description: 'This abstract bronze sculpture is a part of The Family of Man series located at Yorkshire Sculpture Park. Hepworth chose not to create literal representations of the world but developed abstract forms inspired by people and landscapes.',
-  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
-  alt: 'A tall sculpture made of three elements stacked on each other reminding of a human figure.'
-}, {
-  name: 'Cavaliere',
-  artist: 'Lamidi Olonade Fakeye',
-  description: "Descended from four generations of woodcarvers, Fakeye's work blended traditional and contemporary Yoruba themes.",
-  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.png',
-  alt: 'An intricate wood sculpture of a warrior with a focused face on a horse adorned with patterns.'
-}, {
-  name: 'Big Bellies',
-  artist: 'Alina Szapocznikow',
-  description: "Szapocznikow is known for her sculptures of the fragmented body as a metaphor for the fragility and impermanence of youth and beauty. This sculpture depicts two very realistic large bellies stacked on top of each other, each around five feet (1,5m) tall.",
-  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
-  alt: 'The sculpture reminds a cascade of folds, quite different from bellies in classical sculptures.'
-}, {
-  name: 'Terracotta Army',
-  artist: 'Unknown Artist',
-  description: 'The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.',
-  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
-  alt: '12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor.'
-}, {
-  name: 'Lunar Landscape',
-  artist: 'Louise Nevelson',
-  description: 'Nevelson was known for scavenging objects from New York City debris, which she would later assemble into monumental constructions. In this one, she used disparate parts like a bedpost, juggling pin, and seat fragment, nailing and gluing them into boxes that reflect the influence of Cubism’s geometric abstraction of space and form.',
-  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
-  alt: 'A black matte sculpture where the individual elements are initially indistinguishable.'
-}, {
-  name: 'Aureole',
-  artist: 'Ranjani Shettar',
-  description: 'Shettar merges the traditional and the modern, the natural and the industrial. Her art focuses on the relationship between man and nature. Her work was described as compelling both abstractly and figuratively, gravity defying, and a "fine synthesis of unlikely materials."',
-  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
-  alt: 'A pale wire-like sculpture mounted on concrete wall and descending on the floor. It appears light.'
-}, {
-  name: 'Hippos',
-  artist: 'Taipei Zoo',
-  description: 'The Taipei Zoo commissioned a Hippo Square featuring submerged hippos at play.',
   url: 'https://react.dev/images/docs/scientists/6o5Vuyu.jpg',
-  alt: 'A group of bronze hippo sculptures emerging from the sett sidewalk as if they were swimming.'
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
 }];
 ```
 
@@ -1340,19 +944,11 @@ export default function Gallery() {
         Naredno
       </button>
       <h2>
-<<<<<<< HEAD
-        <i>{sculpture.name} </i> 
-        napravio/la {sculpture.artist}
-      </h2>
-      <h3>  
-        ({index + 1} od {sculptureList.length})
-=======
         <i>{sculpture.name} </i>
-        by {sculpture.artist}
+        napravio/la {sculpture.artist}
       </h2>
       <h3>
-        ({index + 1} of {sculptureList.length})
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        ({index + 1} od {sculptureList.length})
       </h3>
       <button onClick={handleMoreClick}>
         {showMore ? 'Sakrij' : 'Prikaži'} detalje
@@ -1371,147 +967,75 @@ export default function Gallery() {
 export const sculptureList = [{
   name: 'Homenaje a la Neurocirugía',
   artist: 'Marta Colvin Andrade',
-<<<<<<< HEAD
   description: 'Iako je Marta Colvin pretežno poznata po apstraktnim temama koje aludiraju na pre-hispanske simbole, ova ogromna skulptura, koja je omaž neurohirurgiji, jedna je od njenih najpoznatijih remek dela.',
-  url: 'https://i.imgur.com/Mx7dA2Y.jpg',
-  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'  
+  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
+  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'
 }, {
   name: 'Floralis Genérica',
   artist: 'Eduardo Catalano',
   description: 'Ovaj ogromni (75 ft. ili 23m) srebrni cvet se nalazi u Buenos Ajresu. Dizajniran je da se pomera, zatvarajući svoje latice uveče ili kada duvaju jaki vetrovi, a otvarajući ih ujutru.',
-  url: 'https://i.imgur.com/ZF6s192m.jpg',
+  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
   alt: 'Velika metalna skulptura cveta sa reflektujućim laticama nalik na ogledalo i snažnim prašnicima.'
 }, {
   name: 'Eternal Presence',
   artist: 'John Woodrow Wilson',
   description: 'Wilson je poznat po svojoj preokupiranosti jednakošću, socijalnom pravdom, kao i suštinskim i duhovnim kvalitetima čovečanstva. Ova masivna (7ft. ili 2,13m) bronzana skulptura predstavlja ono što je on objasnio kao "simbolično crno prisustvo prožeto osećajem univerzalne humanosti".',
-  url: 'https://i.imgur.com/aTtVpES.jpg',
+  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
   alt: 'Skulptura ljudske glave koja deluje sveprisutno i svečano. Zrači mirnoćom i spokojstvom.'
 }, {
   name: 'Moai',
   artist: 'Nepoznati umetnik',
   description: 'Nalazi se na Uskršnjem ostrvu, gde postoji oko 1,000 moai očuvanih monumentalnih skulptura, koje su napravili prvobitni Rapa Nui ljudi, za koje se veruje da predstavljaju pretke Bogova.',
-  url: 'https://i.imgur.com/RCwLEoQm.jpg',
+  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
   alt: 'Tri monumentalne biste sa neproporcionalno velikim glavama i namrštenim licima.'
 }, {
   name: 'Blue Nana',
   artist: 'Niki de Saint Phalle',
   description: 'Nane su trijumfalna stvorenja, simboli ženstvenosti i majčinstva. Inicijalno, Saint Phalle je koristila tkaninu i pronađene objekte za Nane, ali je kasnije uvela poliester kako bi napravila živopisniji dojam.',
-  url: 'https://i.imgur.com/Sd1AgUOm.jpg',
+  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
   alt: 'Velika mozaička skulptura neobične ženske figure u raznobojnom kostimu koji odiše radošću.'
 }, {
   name: 'Ultimate Form',
   artist: 'Barbara Hepworth',
   description: 'Ova apstraktna bronzana skulptura je deo The Family of Man serije koja se nalazi u Jorkširskom parku skulptura. Hepworth je odlučila da ne pravi bukvalne reprezentacije sveta, već apstraktne forme inspirisane ljudima i pejzažima.',
-  url: 'https://i.imgur.com/2heNQDcm.jpg',
+  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
   alt: 'Visoka skulptura tri elementa jedna na drugom koja podseća na ljudsku figuru.'
 }, {
   name: 'Cavaliere',
   artist: 'Lamidi Olonade Fakeye',
   description: "Pošto potiče od četiri generacije drvorezbara, Fakeye-ova dela su mešavina tradicionalne i savremene Joruba tematike.",
-  url: 'https://i.imgur.com/wIdGuZwm.png',
+  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.jpg',
   alt: 'Složena drvena skulptura ratnika čije lice je fokusirano na konja ukrašenim šarama.'
 }, {
   name: 'Big Bellies',
   artist: 'Alina Szapocznikow',
   description: "Alina je poznata po skulpturama izdeljenog tela kao metafore za krhkost i nestalnost mladosti i lepote. Ova skulptura prikazuje dva veoma realistična velika stomaka jednog na drugom, gde je svaki visok oko 5 stopa (1,5m).",
-  url: 'https://i.imgur.com/AlHTAdDm.jpg',
+  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
   alt: 'Ova skulptura podseća na slapove nabora i dosta se razlikuje od stomaka na klasičnim skulpturama.'
 }, {
   name: 'Terracotta Army',
   artist: 'Nepoznati umetnik',
   description: 'Terracotta Army je kolekcija terakota skulptura koje predstavljaju armiju Qin Shi Huang-a, prvog cara Kine. Armija se sastojala od preko 8,000 vojnika, 130 kola sa 520 konja i 150 članova konjice.',
-  url: 'https://i.imgur.com/HMFmH6m.jpg',
+  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
   alt: '12 terakota skulptura svečanih vojnika, od kojih svaki ima jedinstvenu facijalnu ekspresiju i oklop.'
 }, {
   name: 'Lunar Landscape',
   artist: 'Louise Nevelson',
   description: 'Nevelson je poznata po uklanjanju objekata iz ruševina Njujorka, od kojih je kasnije pravila monumentalne konstrukcije. Za ovo je koristila rasparene delove poput noge od kreveta, palice za žongliranje i delove sedišta, zakucavajući ih i lepeći u kutije koje podsećaju na kubističku geometrijsku apstrakciju prostora i forme.',
-  url: 'https://i.imgur.com/rN7hY6om.jpg',
+  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
   alt: 'Crna mat skulptura gde su pojedinačni delovi na početku bili neprimetni.'
 }, {
   name: 'Aureole',
   artist: 'Ranjani Shettar',
   description: 'Shettar spaja tradicionalno i moderno, prirodno i industrijsko. Njena umetnost se fokusira na vezu između čoveka i prirode. Njen rad se opisuje kao ubedljiv i apstraktno i figurativno, prokoseći gravitaciji, kao i "dobra sinteza neobičnih materijala".',
-  url: 'https://i.imgur.com/okTpbHhm.jpg',
+  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
   alt: 'Bleda skulptura nalik na žicu postavljena na betonski zid spuštajući se na pod. Izgleda lako.'
 }, {
   name: 'Hippos',
   artist: 'Taipei Zoo',
   description: 'Zoološki vrt u Tajpeju je naručio trg nilskih konja koji se igraju zaronjeni.',
-  url: 'https://i.imgur.com/6o5Vuyu.jpg',
-  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
-=======
-  description: 'Although Colvin is predominantly known for abstract themes that allude to pre-Hispanic symbols, this gigantic sculpture, an homage to neurosurgery, is one of her most recognizable public art pieces.',
-  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
-  alt: 'A bronze statue of two crossed hands delicately holding a human brain in their fingertips.'
-}, {
-  name: 'Floralis Genérica',
-  artist: 'Eduardo Catalano',
-  description: 'This enormous (75 ft. or 23m) silver flower is located in Buenos Aires. It is designed to move, closing its petals in the evening or when strong winds blow and opening them in the morning.',
-  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
-  alt: 'A gigantic metallic flower sculpture with reflective mirror-like petals and strong stamens.'
-}, {
-  name: 'Eternal Presence',
-  artist: 'John Woodrow Wilson',
-  description: 'Wilson was known for his preoccupation with equality, social justice, as well as the essential and spiritual qualities of humankind. This massive (7ft. or 2,13m) bronze represents what he described as "a symbolic Black presence infused with a sense of universal humanity."',
-  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
-  alt: 'The sculpture depicting a human head seems ever-present and solemn. It radiates calm and serenity.'
-}, {
-  name: 'Moai',
-  artist: 'Unknown Artist',
-  description: 'Located on the Easter Island, there are 1,000 moai, or extant monumental statues, created by the early Rapa Nui people, which some believe represented deified ancestors.',
-  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
-  alt: 'Three monumental stone busts with the heads that are disproportionately large with somber faces.'
-}, {
-  name: 'Blue Nana',
-  artist: 'Niki de Saint Phalle',
-  description: 'The Nanas are triumphant creatures, symbols of femininity and maternity. Initially, Saint Phalle used fabric and found objects for the Nanas, and later on introduced polyester to achieve a more vibrant effect.',
-  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
-  alt: 'A large mosaic sculpture of a whimsical dancing female figure in a colorful costume emanating joy.'
-}, {
-  name: 'Ultimate Form',
-  artist: 'Barbara Hepworth',
-  description: 'This abstract bronze sculpture is a part of The Family of Man series located at Yorkshire Sculpture Park. Hepworth chose not to create literal representations of the world but developed abstract forms inspired by people and landscapes.',
-  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
-  alt: 'A tall sculpture made of three elements stacked on each other reminding of a human figure.'
-}, {
-  name: 'Cavaliere',
-  artist: 'Lamidi Olonade Fakeye',
-  description: "Descended from four generations of woodcarvers, Fakeye's work blended traditional and contemporary Yoruba themes.",
-  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.png',
-  alt: 'An intricate wood sculpture of a warrior with a focused face on a horse adorned with patterns.'
-}, {
-  name: 'Big Bellies',
-  artist: 'Alina Szapocznikow',
-  description: "Szapocznikow is known for her sculptures of the fragmented body as a metaphor for the fragility and impermanence of youth and beauty. This sculpture depicts two very realistic large bellies stacked on top of each other, each around five feet (1,5m) tall.",
-  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
-  alt: 'The sculpture reminds a cascade of folds, quite different from bellies in classical sculptures.'
-}, {
-  name: 'Terracotta Army',
-  artist: 'Unknown Artist',
-  description: 'The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.',
-  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
-  alt: '12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor.'
-}, {
-  name: 'Lunar Landscape',
-  artist: 'Louise Nevelson',
-  description: 'Nevelson was known for scavenging objects from New York City debris, which she would later assemble into monumental constructions. In this one, she used disparate parts like a bedpost, juggling pin, and seat fragment, nailing and gluing them into boxes that reflect the influence of Cubism’s geometric abstraction of space and form.',
-  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
-  alt: 'A black matte sculpture where the individual elements are initially indistinguishable.'
-}, {
-  name: 'Aureole',
-  artist: 'Ranjani Shettar',
-  description: 'Shettar merges the traditional and the modern, the natural and the industrial. Her art focuses on the relationship between man and nature. Her work was described as compelling both abstractly and figuratively, gravity defying, and a "fine synthesis of unlikely materials."',
-  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
-  alt: 'A pale wire-like sculpture mounted on concrete wall and descending on the floor. It appears light.'
-}, {
-  name: 'Hippos',
-  artist: 'Taipei Zoo',
-  description: 'The Taipei Zoo commissioned a Hippo Square featuring submerged hippos at play.',
   url: 'https://react.dev/images/docs/scientists/6o5Vuyu.jpg',
-  alt: 'A group of bronze hippo sculptures emerging from the sett sidewalk as if they were swimming.'
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
 }];
 ```
 
@@ -1582,19 +1106,11 @@ export default function Gallery() {
         Naredno
       </button>
       <h2>
-<<<<<<< HEAD
-        <i>{sculpture.name} </i> 
-        napravio/la {sculpture.artist}
-      </h2>
-      <h3>  
-        ({index + 1} od {sculptureList.length})
-=======
         <i>{sculpture.name} </i>
-        by {sculpture.artist}
+        napravio/la {sculpture.artist}
       </h2>
       <h3>
-        ({index + 1} of {sculptureList.length})
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        ({index + 1} od {sculptureList.length})
       </h3>
       <button onClick={handleMoreClick}>
         {showMore ? 'Sakrij' : 'Prikaži'} detalje
@@ -1613,147 +1129,75 @@ export default function Gallery() {
 export const sculptureList = [{
   name: 'Homenaje a la Neurocirugía',
   artist: 'Marta Colvin Andrade',
-<<<<<<< HEAD
   description: 'Iako je Marta Colvin pretežno poznata po apstraktnim temama koje aludiraju na pre-hispanske simbole, ova ogromna skulptura, koja je omaž neurohirurgiji, jedna je od njenih najpoznatijih remek dela.',
-  url: 'https://i.imgur.com/Mx7dA2Y.jpg',
-  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'  
+  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
+  alt: 'Bronzana statua dve skrštene ruke koje pažljivo drže ljudski mozak vrhovima prstiju.'
 }, {
   name: 'Floralis Genérica',
   artist: 'Eduardo Catalano',
   description: 'Ovaj ogromni (75 ft. ili 23m) srebrni cvet se nalazi u Buenos Ajresu. Dizajniran je da se pomera, zatvarajući svoje latice uveče ili kada duvaju jaki vetrovi, a otvarajući ih ujutru.',
-  url: 'https://i.imgur.com/ZF6s192m.jpg',
+  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
   alt: 'Velika metalna skulptura cveta sa reflektujućim laticama nalik na ogledalo i snažnim prašnicima.'
 }, {
   name: 'Eternal Presence',
   artist: 'John Woodrow Wilson',
   description: 'Wilson je poznat po svojoj preokupiranosti jednakošću, socijalnom pravdom, kao i suštinskim i duhovnim kvalitetima čovečanstva. Ova masivna (7ft. ili 2,13m) bronzana skulptura predstavlja ono što je on objasnio kao "simbolično crno prisustvo prožeto osećajem univerzalne humanosti".',
-  url: 'https://i.imgur.com/aTtVpES.jpg',
+  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
   alt: 'Skulptura ljudske glave koja deluje sveprisutno i svečano. Zrači mirnoćom i spokojstvom.'
 }, {
   name: 'Moai',
   artist: 'Nepoznati umetnik',
   description: 'Nalazi se na Uskršnjem ostrvu, gde postoji oko 1,000 moai očuvanih monumentalnih skulptura, koje su napravili prvobitni Rapa Nui ljudi, za koje se veruje da predstavljaju pretke Bogova.',
-  url: 'https://i.imgur.com/RCwLEoQm.jpg',
+  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
   alt: 'Tri monumentalne biste sa neproporcionalno velikim glavama i namrštenim licima.'
 }, {
   name: 'Blue Nana',
   artist: 'Niki de Saint Phalle',
   description: 'Nane su trijumfalna stvorenja, simboli ženstvenosti i majčinstva. Inicijalno, Saint Phalle je koristila tkaninu i pronađene objekte za Nane, ali je kasnije uvela poliester kako bi napravila živopisniji dojam.',
-  url: 'https://i.imgur.com/Sd1AgUOm.jpg',
+  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
   alt: 'Velika mozaička skulptura neobične ženske figure u raznobojnom kostimu koji odiše radošću.'
 }, {
   name: 'Ultimate Form',
   artist: 'Barbara Hepworth',
   description: 'Ova apstraktna bronzana skulptura je deo The Family of Man serije koja se nalazi u Jorkširskom parku skulptura. Hepworth je odlučila da ne pravi bukvalne reprezentacije sveta, već apstraktne forme inspirisane ljudima i pejzažima.',
-  url: 'https://i.imgur.com/2heNQDcm.jpg',
+  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
   alt: 'Visoka skulptura tri elementa jedna na drugom koja podseća na ljudsku figuru.'
 }, {
   name: 'Cavaliere',
   artist: 'Lamidi Olonade Fakeye',
   description: "Pošto potiče od četiri generacije drvorezbara, Fakeye-ova dela su mešavina tradicionalne i savremene Joruba tematike.",
-  url: 'https://i.imgur.com/wIdGuZwm.png',
+  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.jpg',
   alt: 'Složena drvena skulptura ratnika čije lice je fokusirano na konja ukrašenim šarama.'
 }, {
   name: 'Big Bellies',
   artist: 'Alina Szapocznikow',
   description: "Alina je poznata po skulpturama izdeljenog tela kao metafore za krhkost i nestalnost mladosti i lepote. Ova skulptura prikazuje dva veoma realistična velika stomaka jednog na drugom, gde je svaki visok oko 5 stopa (1,5m).",
-  url: 'https://i.imgur.com/AlHTAdDm.jpg',
+  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
   alt: 'Ova skulptura podseća na slapove nabora i dosta se razlikuje od stomaka na klasičnim skulpturama.'
 }, {
   name: 'Terracotta Army',
   artist: 'Nepoznati umetnik',
   description: 'Terracotta Army je kolekcija terakota skulptura koje predstavljaju armiju Qin Shi Huang-a, prvog cara Kine. Armija se sastojala od preko 8,000 vojnika, 130 kola sa 520 konja i 150 članova konjice.',
-  url: 'https://i.imgur.com/HMFmH6m.jpg',
+  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
   alt: '12 terakota skulptura svečanih vojnika, od kojih svaki ima jedinstvenu facijalnu ekspresiju i oklop.'
 }, {
   name: 'Lunar Landscape',
   artist: 'Louise Nevelson',
   description: 'Nevelson je poznata po uklanjanju objekata iz ruševina Njujorka, od kojih je kasnije pravila monumentalne konstrukcije. Za ovo je koristila rasparene delove poput noge od kreveta, palice za žongliranje i delove sedišta, zakucavajući ih i lepeći u kutije koje podsećaju na kubističku geometrijsku apstrakciju prostora i forme.',
-  url: 'https://i.imgur.com/rN7hY6om.jpg',
+  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
   alt: 'Crna mat skulptura gde su pojedinačni delovi na početku bili neprimetni.'
 }, {
   name: 'Aureole',
   artist: 'Ranjani Shettar',
   description: 'Shettar spaja tradicionalno i moderno, prirodno i industrijsko. Njena umetnost se fokusira na vezu između čoveka i prirode. Njen rad se opisuje kao ubedljiv i apstraktno i figurativno, prokoseći gravitaciji, kao i "dobra sinteza neobičnih materijala".',
-  url: 'https://i.imgur.com/okTpbHhm.jpg',
+  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
   alt: 'Bleda skulptura nalik na žicu postavljena na betonski zid spuštajući se na pod. Izgleda lako.'
 }, {
   name: 'Hippos',
   artist: 'Taipei Zoo',
   description: 'Zoološki vrt u Tajpeju je naručio trg nilskih konja koji se igraju zaronjeni.',
-  url: 'https://i.imgur.com/6o5Vuyu.jpg',
-  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
-=======
-  description: 'Although Colvin is predominantly known for abstract themes that allude to pre-Hispanic symbols, this gigantic sculpture, an homage to neurosurgery, is one of her most recognizable public art pieces.',
-  url: 'https://react.dev/images/docs/scientists/Mx7dA2Y.jpg',
-  alt: 'A bronze statue of two crossed hands delicately holding a human brain in their fingertips.'
-}, {
-  name: 'Floralis Genérica',
-  artist: 'Eduardo Catalano',
-  description: 'This enormous (75 ft. or 23m) silver flower is located in Buenos Aires. It is designed to move, closing its petals in the evening or when strong winds blow and opening them in the morning.',
-  url: 'https://react.dev/images/docs/scientists/ZF6s192m.jpg',
-  alt: 'A gigantic metallic flower sculpture with reflective mirror-like petals and strong stamens.'
-}, {
-  name: 'Eternal Presence',
-  artist: 'John Woodrow Wilson',
-  description: 'Wilson was known for his preoccupation with equality, social justice, as well as the essential and spiritual qualities of humankind. This massive (7ft. or 2,13m) bronze represents what he described as "a symbolic Black presence infused with a sense of universal humanity."',
-  url: 'https://react.dev/images/docs/scientists/aTtVpES.jpg',
-  alt: 'The sculpture depicting a human head seems ever-present and solemn. It radiates calm and serenity.'
-}, {
-  name: 'Moai',
-  artist: 'Unknown Artist',
-  description: 'Located on the Easter Island, there are 1,000 moai, or extant monumental statues, created by the early Rapa Nui people, which some believe represented deified ancestors.',
-  url: 'https://react.dev/images/docs/scientists/RCwLEoQm.jpg',
-  alt: 'Three monumental stone busts with the heads that are disproportionately large with somber faces.'
-}, {
-  name: 'Blue Nana',
-  artist: 'Niki de Saint Phalle',
-  description: 'The Nanas are triumphant creatures, symbols of femininity and maternity. Initially, Saint Phalle used fabric and found objects for the Nanas, and later on introduced polyester to achieve a more vibrant effect.',
-  url: 'https://react.dev/images/docs/scientists/Sd1AgUOm.jpg',
-  alt: 'A large mosaic sculpture of a whimsical dancing female figure in a colorful costume emanating joy.'
-}, {
-  name: 'Ultimate Form',
-  artist: 'Barbara Hepworth',
-  description: 'This abstract bronze sculpture is a part of The Family of Man series located at Yorkshire Sculpture Park. Hepworth chose not to create literal representations of the world but developed abstract forms inspired by people and landscapes.',
-  url: 'https://react.dev/images/docs/scientists/2heNQDcm.jpg',
-  alt: 'A tall sculpture made of three elements stacked on each other reminding of a human figure.'
-}, {
-  name: 'Cavaliere',
-  artist: 'Lamidi Olonade Fakeye',
-  description: "Descended from four generations of woodcarvers, Fakeye's work blended traditional and contemporary Yoruba themes.",
-  url: 'https://react.dev/images/docs/scientists/wIdGuZwm.png',
-  alt: 'An intricate wood sculpture of a warrior with a focused face on a horse adorned with patterns.'
-}, {
-  name: 'Big Bellies',
-  artist: 'Alina Szapocznikow',
-  description: "Szapocznikow is known for her sculptures of the fragmented body as a metaphor for the fragility and impermanence of youth and beauty. This sculpture depicts two very realistic large bellies stacked on top of each other, each around five feet (1,5m) tall.",
-  url: 'https://react.dev/images/docs/scientists/AlHTAdDm.jpg',
-  alt: 'The sculpture reminds a cascade of folds, quite different from bellies in classical sculptures.'
-}, {
-  name: 'Terracotta Army',
-  artist: 'Unknown Artist',
-  description: 'The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.',
-  url: 'https://react.dev/images/docs/scientists/HMFmH6m.jpg',
-  alt: '12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor.'
-}, {
-  name: 'Lunar Landscape',
-  artist: 'Louise Nevelson',
-  description: 'Nevelson was known for scavenging objects from New York City debris, which she would later assemble into monumental constructions. In this one, she used disparate parts like a bedpost, juggling pin, and seat fragment, nailing and gluing them into boxes that reflect the influence of Cubism’s geometric abstraction of space and form.',
-  url: 'https://react.dev/images/docs/scientists/rN7hY6om.jpg',
-  alt: 'A black matte sculpture where the individual elements are initially indistinguishable.'
-}, {
-  name: 'Aureole',
-  artist: 'Ranjani Shettar',
-  description: 'Shettar merges the traditional and the modern, the natural and the industrial. Her art focuses on the relationship between man and nature. Her work was described as compelling both abstractly and figuratively, gravity defying, and a "fine synthesis of unlikely materials."',
-  url: 'https://react.dev/images/docs/scientists/okTpbHhm.jpg',
-  alt: 'A pale wire-like sculpture mounted on concrete wall and descending on the floor. It appears light.'
-}, {
-  name: 'Hippos',
-  artist: 'Taipei Zoo',
-  description: 'The Taipei Zoo commissioned a Hippo Square featuring submerged hippos at play.',
   url: 'https://react.dev/images/docs/scientists/6o5Vuyu.jpg',
-  alt: 'A group of bronze hippo sculptures emerging from the sett sidewalk as if they were swimming.'
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+  alt: 'Grupa bronzanih skulptura nilskih konja koji kao da isplivavaju na trotoar.'
 }];
 ```
 
@@ -2002,11 +1446,7 @@ export default function FeedbackForm() {
 
 Pokušajte da pomerite drugi `useState` poziv nakon `if` uslova i vidite kako ponovo neće raditi.
 
-<<<<<<< HEAD
-Ako je vaš linter [konfigurisan za React](/learn/editor-setup#linting), trebali biste videti lint grešku kad uradite ovako nešto. Ako ne vidite grešku kada napišete neispravan kod lokalno, potrebno je da postavite linting za vaš projekat. 
-=======
-If your linter is [configured for React](/learn/editor-setup#linting), you should see a lint error when you make a mistake like this. If you don't see an error when you try the faulty code locally, you need to set up linting for your project.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+Ako je vaš linter [konfigurisan za React](/learn/editor-setup#linting), trebali biste videti lint grešku kad uradite ovako nešto. Ako ne vidite grešku kada napišete neispravan kod lokalno, potrebno je da postavite linting za vaš projekat.
 
 </Solution>
 
diff --git a/src/content/learn/thinking-in-react.md b/src/content/learn/thinking-in-react.md
index 9b732779..0ec2cbbd 100644
--- a/src/content/learn/thinking-in-react.md
+++ b/src/content/learn/thinking-in-react.md
@@ -38,15 +38,9 @@ Započnite crtanjem granica oko svake komponente i subkomponente na mockup-u i p
 
 U zavisnosti od vašeg znanja, možete razmišljati o podeli dizajna na komponente na više načina:
 
-<<<<<<< HEAD
 * **Programiranje**--koristite iste tehnike odlučivanja kao da trebate kreirati novu funkciju ili objekat. Jedna takva tehnika je [razdvajanje odgovornosti (separation of concerns)](https://en.wikipedia.org/wiki/Separation_of_concerns), što znači da bi se komponenta idealno trebala baviti samo jednom stvari. Ako se komponenta povećava, trebalo bi je rasparčati na manje subkomponente.
 * **CSS**--razmotrite za šta biste kreirali class selector-e. (Ipak, komponente su malo granularnije.)
 * **Dizajn**--razmotrite kako biste organizovali slojeve dizajna.
-=======
-* **Programming**--use the same techniques for deciding if you should create a new function or object. One such technique is the [separation of concerns](https://en.wikipedia.org/wiki/Separation_of_concerns), that is, a component should ideally only be concerned with one thing. If it ends up growing, it should be decomposed into smaller subcomponents.
-* **CSS**--consider what you would make class selectors for. (However, components are a bit less granular.)
-* **Design**--consider how you would organize the design's layers.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 Ako je vaš JSON dobro struktuiran, često ćete primetiti da se prirodno mapira na strukturu komponenti na vašem UI-u. To je zato što UI i modeli podataka često imaju istu arhitekturu informacija, odnosno isti oblik. Podelite UI na komponente tako da svaka komponenta odgovara jednom delu modela podataka.
 
@@ -235,17 +229,10 @@ Ono što ostaje je verovatno state.
 
 Prođimo kroz podatke još jednom:
 
-<<<<<<< HEAD
 1. Originalna lista proizvoda je **prosleđena kao props, tako da nije state**.
 2. Tekst za pretragu deluje kao state zato što se vremenom menja i ne može biti izračunat.
 3. Vrednost checkbox-a deluje kao state zato što se vremenom menja i ne može biti izračunata.
 4. Filtrirana lista proizvoda **nije state zato što može biti izračunata** filtriranjem originalne liste proizvoda pomoću teksta za pretragu i vrednosti checkbox-a.
-=======
-1. The original list of products is **passed in as props, so it's not state.**
-2. The search text seems to be state since it changes over time and can't be computed from anything.
-3. The value of the checkbox seems to be state since it changes over time and can't be computed from anything.
-4. The filtered list of products **isn't state because it can be computed** by taking the original list of products and filtering it according to the search text and value of the checkbox.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 Ovo znači da su samo tekst za pretragu i vrednost checkbox-a state-ovi! Dobar posao!
 
@@ -279,23 +266,13 @@ U prethodnom koraku, pronašli ste dva state-a u aplikaciji: tekst za pretragu i
 
 Primenimo našu strategiju za njih:
 
-<<<<<<< HEAD
 1. **Identifikovati komponente koje koriste state:**
-    * `ProductTable` treba da filtrira listu proizvoda na osnovu state-a (tekst za pretragu i vrednost checkbox-a). 
+    * `ProductTable` treba da filtrira listu proizvoda na osnovu state-a (tekst za pretragu i vrednost checkbox-a).
     * `SearchBar` treba da prikaže state (tekst za pretragu i vrednost checkbox-a).
 2. **Pronaći zajedničkog roditelja:** Prva komponenta koja sadrži obe komponente je `FilterableProductTable`.
 3. **Odlučiti gde živi state:** Držaćemo tekst za pretragu i vrednost checkbox-a u `FilterableProductTable`.
 
 Znači, state vrednosti će živeti u `FilterableProductTable`.
-=======
-1. **Identify components that use state:**
-    * `ProductTable` needs to filter the product list based on that state (search text and checkbox value).
-    * `SearchBar` needs to display that state (search text and checkbox value).
-2. **Find their common parent:** The first parent component both components share is `FilterableProductTable`.
-3. **Decide where the state lives**: We'll keep the filter text and checked state values in `FilterableProductTable`.
-
-So the state values will live in `FilterableProductTable`.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 Dodajte state u komponentu pomoću [`useState()` Hook](/reference/react/useState)-a. Hook-ovi su posebne funkcije koje vam omogućavaju da "se zakačite" za React. Dodajte dve state promenljive na vrh `FilterableProductTable` i zadajte njihov početni state:
 
@@ -413,17 +390,10 @@ function ProductTable({ products, filterText, inStockOnly }) {
 function SearchBar({ filterText, inStockOnly }) {
   return (
     <form>
-<<<<<<< HEAD
-      <input 
-        type="text" 
-        value={filterText} 
-        placeholder="Pretraži..."/>
-=======
       <input
         type="text"
         value={filterText}
-        placeholder="Search..."/>
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        placeholder="Pretraži..."/>
       <label>
         <input
           type="checkbox"
@@ -488,17 +458,10 @@ U sandbox-u iznad, `ProductTable` i `SearchBar` čitaju `filterText` i `inStockO
 function SearchBar({ filterText, inStockOnly }) {
   return (
     <form>
-<<<<<<< HEAD
-      <input 
-        type="text" 
-        value={filterText} 
-        placeholder="Pretraži..."/>
-=======
       <input
         type="text"
         value={filterText}
-        placeholder="Search..."/>
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        placeholder="Pretraži..."/>
 ```
 
 Međutim, još uvek niste dodali kod koji bi odgovarao na korisničke akcije poput kucanja. To će biti naš poslednji korak.
@@ -506,11 +469,7 @@ Međutim, još uvek niste dodali kod koji bi odgovarao na korisničke akcije pop
 
 ## Korak 5: Dodati inverzni data flow {/*step-5-add-inverse-data-flow*/}
 
-<<<<<<< HEAD
 Trenutno, vaša aplikacija korektno renderuje props-e i state-ove koje komponente dobijaju od roditelja. Ali, da biste promenili state na osnovu korisničkog input-a, morate podržati data flow na drugačiji način: komponente duboko u hijerarhiji trebaju promeniti state u `FilterableProductTable`.
-=======
-Currently your app renders correctly with props and state flowing down the hierarchy. But to change the state according to user input, you will need to support data flowing the other way: the form components deep in the hierarchy need to update the state in `FilterableProductTable`.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 React eksplicitno podržava ovakav data flow, ali je potrebno malo više od dvosmernog data binding-a. Ako pokušate da kucate ili promenite vrednost checkbox-a u primeru iznad, videćete da React ignoriše vaš input. To je namerno urađeno. Kada napišete `<input value={filterText} />`, setovaćete `value` prop `input`-a da uvek bude jednak `filterText` state-u prosleđenom iz `FilterableProductTable`. Pošto se `filterText` state nikad ne menja, ni input se ne menja.
 
@@ -655,15 +614,9 @@ function SearchBar({
 }) {
   return (
     <form>
-<<<<<<< HEAD
-      <input 
-        type="text" 
-        value={filterText} placeholder="Pretraži..." 
-=======
       <input
         type="text"
-        value={filterText} placeholder="Search..."
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+        value={filterText} placeholder="Pretraži..."
         onChange={(e) => onFilterTextChange(e.target.value)} />
       <label>
         <input
diff --git a/src/content/learn/tutorial-tic-tac-toe.md b/src/content/learn/tutorial-tic-tac-toe.md
index c16981dd..e94cc379 100644
--- a/src/content/learn/tutorial-tic-tac-toe.md
+++ b/src/content/learn/tutorial-tic-tac-toe.md
@@ -337,11 +337,7 @@ import './styles.css';
 import App from './App';
 ```
 
-<<<<<<< HEAD
 Linije 1-5 spajaju sve potrebne delove zajedno:
-=======
-Lines 1-5 bring all the necessary pieces together:
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 - React
 - React-ov library za komunikaciju sa web browserima (React DOM)
@@ -555,11 +551,7 @@ export default function Board() {
 }
 ```
 
-<<<<<<< HEAD
 Obratite pažnju na to da, za razliku od browser-ovih `div`-ova, vaše component-e `Board` i `Square` moraju počinjati velikim slovom.
-=======
-Note how unlike the browser `div`s, your own components `Board` and `Square` must start with a capital letter.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 Hajde da pogledamo:
 
@@ -1102,11 +1094,7 @@ function Square({ value, onSquareClick }) {
 }
 ```
 
-<<<<<<< HEAD
 Sada ćete povezati `onSquareClick` prop sa funkcijom u `Board` component-i koju ćete nazvati `handleClick`. Da biste povezali `onSquareClick` sa `handleClick`, prosledićete funkciju kao vrednost `onSquareClick` prop-u prve `Square` component-e:
-=======
-Now you'll connect the `onSquareClick` prop to a function in the `Board` component that you'll name `handleClick`. To connect `onSquareClick` to `handleClick` you'll pass a function to the `onSquareClick` prop of the first `Square` component:
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 ```js {7}
 export default function Board() {
@@ -2095,22 +2083,13 @@ export default function Game() {
 }
 ```
 
-<<<<<<< HEAD
 Možete videti kako vaš kod treba da izgleda ispod. Imajte na umu da biste u konzoli trebalo da vidite grešku koja kaže:
-=======
-You can see what your code should look like below. Note that you should see an error in the developer tools console that says:
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 <ConsoleBlock level="warning">
 Warning: Each child in an array or iterator should have a unique "key" prop. Check the render method of &#96;Game&#96;.
 </ConsoleBlock>
-<<<<<<< HEAD
-  
-Ovu grešku ćete rešiti u sledećem odeljku.
-=======
 
-You'll fix this error in the next section.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+Ovu grešku ćete rešiti u sledećem odeljku.
 
 <Sandpack>
 
diff --git a/src/content/learn/updating-objects-in-state.md b/src/content/learn/updating-objects-in-state.md
index 78d9a1bb..780c4bdd 100644
--- a/src/content/learn/updating-objects-in-state.md
+++ b/src/content/learn/updating-objects-in-state.md
@@ -296,11 +296,7 @@ setPerson({
 });
 ```
 
-<<<<<<< HEAD
-Sada forma radi! 
-=======
-Now the form works!
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
+Sada forma radi!
 
 Primetite da niste deklarisali posebnu state promenljivu za svako input polje. Za velike forme, grupisanje svih podataka u objekat je veoma zgodno--dok god ga ažurirate kako treba!
 
@@ -377,11 +373,7 @@ input { margin-left: 5px; margin-bottom: 5px; }
 
 </Sandpack>
 
-<<<<<<< HEAD
 Primetite da je `...` spread sintaksa "plitka"--kopira polja samo na prvom nivou dubine. Ovo je čini brzom, ali, takođe znači da ako želite ažurirati ugnježdeno polje, moraćete je koristiti više od jednom.
-=======
-Note that the `...` spread syntax is "shallow"--it only copies things one level deep. This makes it fast, but it also means that if you want to update a nested property, you'll have to use it more than once.
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 
 <DeepDive>
 
diff --git a/src/content/learn/writing-markup-with-jsx.md b/src/content/learn/writing-markup-with-jsx.md
index dc931144..cf544386 100644
--- a/src/content/learn/writing-markup-with-jsx.md
+++ b/src/content/learn/writing-markup-with-jsx.md
@@ -69,17 +69,10 @@ JSX i React su dve odvojene stvari. Često se koriste zajedno, ali *možete* [ih
 Pretpostavimo da imate neki (potpuno validan) HTML:
 
 ```html
-<<<<<<< HEAD
 <h1>Hedy Lamarr-ina Todo lista</h1>
-<img 
-  src="https://i.imgur.com/yXOvdOSs.jpg" 
-  alt="Hedy Lamarr" 
-=======
-<h1>Hedy Lamarr's Todos</h1>
 <img
   src="https://react.dev/images/docs/scientists/yXOvdOSs.jpg"
   alt="Hedy Lamarr"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
   class="photo"
 >
 <ul>
@@ -107,19 +100,11 @@ Ako uradite samo copy/paste, to neće raditi:
 ```js
 export default function TodoList() {
   return (
-<<<<<<< HEAD
     // Ovo baš i ne radi!
     <h1>Hedy Lamarr-ina Todo lista</h1>
-    <img 
-      src="https://i.imgur.com/yXOvdOSs.jpg" 
-      alt="Hedy Lamarr" 
-=======
-    // This doesn't quite work!
-    <h1>Hedy Lamarr's Todos</h1>
     <img
       src="https://react.dev/images/docs/scientists/yXOvdOSs.jpg"
       alt="Hedy Lamarr"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
       class="photo"
     >
     <ul>
@@ -155,17 +140,10 @@ Na primer, možete koristiti `<div>`:
 
 ```js {1,11}
 <div>
-<<<<<<< HEAD
   <h1>Hedy Lamarr-ina Todo lista</h1>
-  <img 
-    src="https://i.imgur.com/yXOvdOSs.jpg" 
-    alt="Hedy Lamarr" 
-=======
-  <h1>Hedy Lamarr's Todos</h1>
   <img
     src="https://react.dev/images/docs/scientists/yXOvdOSs.jpg"
     alt="Hedy Lamarr"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
     class="photo"
   >
   <ul>
@@ -179,17 +157,10 @@ Ako ne želite da dodate novi `<div>` u vaš markup, možete umesto toga koristi
 
 ```js {1,11}
 <>
-<<<<<<< HEAD
   <h1>Hedy Lamarr-ina Todo lista</h1>
-  <img 
-    src="https://i.imgur.com/yXOvdOSs.jpg" 
-    alt="Hedy Lamarr" 
-=======
-  <h1>Hedy Lamarr's Todos</h1>
   <img
     src="https://react.dev/images/docs/scientists/yXOvdOSs.jpg"
     alt="Hedy Lamarr"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
     class="photo"
   >
   <ul>
@@ -263,19 +234,11 @@ Ovo je konačni rezultat:
 export default function TodoList() {
   return (
     <>
-<<<<<<< HEAD
       <h1>Hedy Lamarr-ina Todo lista</h1>
-      <img 
-        src="https://i.imgur.com/yXOvdOSs.jpg" 
-        alt="Hedy Lamarr" 
-        className="photo" 
-=======
-      <h1>Hedy Lamarr's Todos</h1>
       <img
         src="https://react.dev/images/docs/scientists/yXOvdOSs.jpg"
         alt="Hedy Lamarr"
         className="photo"
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
       />
       <ul>
         <li>Izmisli nove semafore</li>
diff --git a/src/content/learn/your-first-component.md b/src/content/learn/your-first-component.md
index 5bb89086..16c33b88 100644
--- a/src/content/learn/your-first-component.md
+++ b/src/content/learn/your-first-component.md
@@ -163,17 +163,10 @@ Primetite razliku u veličini slova:
 
 ```html
 <section>
-<<<<<<< HEAD
   <h1>Zadivljujući naučnici</h1>
-  <img src="https://i.imgur.com/MK3eW3As.jpg" alt="Katherine Johnson" />
-  <img src="https://i.imgur.com/MK3eW3As.jpg" alt="Katherine Johnson" />
-  <img src="https://i.imgur.com/MK3eW3As.jpg" alt="Katherine Johnson" />
-=======
-  <h1>Amazing scientists</h1>
   <img src="https://react.dev/images/docs/scientists/MK3eW3As.jpg" alt="Katherine Johnson" />
   <img src="https://react.dev/images/docs/scientists/MK3eW3As.jpg" alt="Katherine Johnson" />
   <img src="https://react.dev/images/docs/scientists/MK3eW3As.jpg" alt="Katherine Johnson" />
->>>>>>> abe931a8cb3aee3e8b15ef7e187214789164162a
 </section>
 ```
 

From a65eecfe734a864aa74717e843465590646c005e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rado=C5=A1=20Mili=C4=87ev?=
 <40705899+rammba@users.noreply.github.com>
Date: Tue, 14 Apr 2026 19:22:26 +0200
Subject: [PATCH 2/2] Lintfix

---
 src/content/learn/responding-to-events.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/learn/responding-to-events.md b/src/content/learn/responding-to-events.md
index 6c16fcdb..ab55afb3 100644
--- a/src/content/learn/responding-to-events.md
+++ b/src/content/learn/responding-to-events.md
@@ -436,7 +436,7 @@ U retkim slučajevima, možete poželeti da uhvatite sve event-e iz dečjih elem
 Svaki event se propagira u tri faze:
 
 1. Putuje na dole, pozivajući sve `onClickCapture` handler-e.
-2. Pokreće `onClick` handler na kliknutom elementu. 
+2. Pokreće `onClick` handler na kliknutom elementu.
 3. Putuje na gore, pozivajući sve `onClick` handler-e.
 
 Capture event-i su korisni za rutere i analitiku, ali ih verovatno nećete koristiti u kodu aplikacije.