Fixing after react update

client/src/index.js

@@ -1,5 +1,13 @@
+<<<<<<< HEAD
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './App';
+
+ReactDOM.render(<App />, document.getElementById('root'));
+=======
 import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App";
 const root = ReactDOM.createRoot(document.getElementById('root'));
-root.render(<App />);
+root.render(<App />);
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb