Resolve merge conflicts

Author: rammba

src/content/learn/choosing-the-state-structure.md

@@ -1715,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],   
->>>>>>> d271a7ac11d2bf0d6e95ebdfacaf1038421f9be0
   },
   35: {
     id: 35,

src/content/learn/creating-a-react-app.md

@@ -63,13 +63,8 @@ Expo je održavan od strane [Expo (kompanije)](https://expo.dev/about). Kreiranj
 
 Postoji nekoliko nadolazećih framework-ova koji rade na našoj full stack React viziji:
 
-<<<<<<< HEAD
-- [TanStack Start (Beta)](https://tanstack.com/): TanStack Start je full-stack React framework nastao zbog TanStack Router-a. Pruža renderovanje celih dokumenata na serverskoj strani, strimovanje, serverske funkcije, bundle-ovanje i još mnogo toga koristeći alate poput Nitro-a i Vite-a.
-- [RedwoodJS](https://redwoodjs.com/): Redwood je full stack React framework sa mnogo unapred instaliranih paketa i konfiguracija koje olakšavaju pravljenje full-stack web aplikacija.
-=======
-- [TanStack Start (Beta)](https://tanstack.com/start/): TanStack Start is a full-stack React framework powered by TanStack Router. It provides a full-document SSR, streaming, server functions, bundling, and more using tools like Nitro and Vite.
-- [RedwoodSDK](https://rwsdk.com/): Redwood is a full stack React framework with lots of pre-installed packages and configuration that makes it easy to build full-stack web applications.
->>>>>>> d271a7ac11d2bf0d6e95ebdfacaf1038421f9be0
+- [TanStack Start (Beta)](https://tanstack.com/start/): TanStack Start je full-stack React framework nastao zbog TanStack Router-a. Pruža renderovanje celih dokumenata na serverskoj strani, strimovanje, serverske funkcije, bundle-ovanje i još mnogo toga koristeći alate poput Nitro-a i Vite-a.
+- [RedwoodSDK](https://rwsdk.com/): Redwood je full stack React framework sa mnogo unapred instaliranih paketa i konfiguracija koje olakšavaju pravljenje full-stack web aplikacija.
 
 <DeepDive>
 

src/content/reference/react/index.md

@@ -21,24 +21,14 @@ Programske React funkcionalnosti:
 
 ## React DOM {/*react-dom*/}
 
-<<<<<<< HEAD
-React-dom sadrži funkcionalnosti koje su podržane samo za web aplikacije (koje su pokrenute u DOM okruženju pretraživača). Ova sekcija se deli na sledeće celine:
+React DOM sadrži funkcionalnosti koje su podržane samo za web aplikacije (koje su pokrenute u DOM okruženju pretraživača). Ova sekcija se deli na sledeće celine:
 
 * [Hook-ovi](/reference/react-dom/hooks) - Hook-ovi za web aplikacije koje su pokrenute u DOM okruženju pretraživača.
 * [Komponente](/reference/react-dom/components) - React sadrži sve HTML i SVG komponente ugrađene u pretraživač.
 * [API-ji](/reference/react-dom) - `react-dom` paket sadrži metode podržane samo u web aplikacijama.
 * [Klijentski API-ji](/reference/react-dom/client) - `react-dom/client` API-ji omogućavaju renderovanje React komponenata na klijentu (u pretraživaču).
 * [Serverski API-ji](/reference/react-dom/server) - `react-dom/server` API-ji omogućavaju renderovanje React komponenata u HTML na serveru.
-=======
-React DOM contains features that are only supported for web applications (which run in the browser DOM environment). This section is broken into the following:
-
-* [Hooks](/reference/react-dom/hooks) - Hooks for web applications which run in the browser DOM environment.
-* [Components](/reference/react-dom/components) - React supports all of the browser built-in HTML and SVG components.
-* [APIs](/reference/react-dom) - The `react-dom` package contains methods supported only in web applications.
-* [Client APIs](/reference/react-dom/client) - The `react-dom/client` APIs let you render React components on the client (in the browser).
-* [Server APIs](/reference/react-dom/server) - The `react-dom/server` APIs let you render React components to HTML on the server.
-* [Static APIs](/reference/react-dom/static) - The `react-dom/static` APIs let you generate static HTML for React components.
->>>>>>> d271a7ac11d2bf0d6e95ebdfacaf1038421f9be0
+* [Statički API-ji](/reference/react-dom/static) - `react-dom/static` API-ji omogućavaju generisanje statičkog HTML-a za React komponente.
 
 ## React kompajler {/*react-compiler*/}