fixing merge conflicts

package.json

@@ -6,9 +6,9 @@
     "bch-message-lib": "2.2.1",
     "bootstrap": "5.2.0",
     "query-string": "7.1.1",
-    "react": "18.2.0",
-    "react-bootstrap": "2.4.0",
-    "react-dom": "18.2.0",
+    "react": "19.0.0",
+    "react-bootstrap": "2.10.7",
+    "react-dom": "19.0.0",
     "react-scripts": "5.0.1",
     "use-query-params": "1.2.3"
   },

src/index.js

@@ -1,21 +1,21 @@
 /*
-*/
+ */
 
 import React from 'react'
-import ReactDOM from 'react-dom'
+import ReactDOM from 'react-dom/client'
 import App from './App'
 import { QueryParamProvider } from 'use-query-params'
 
 // Importing the Bootstrap CSS
 import 'bootstrap/dist/css/bootstrap.min.css'
 
-ReactDOM.render(
-  <>
-    <QueryParamProvider>
-      <App />
-    </QueryParamProvider>
-  </>
-  , document.getElementById('root'))
+const root = ReactDOM.createRoot(document.getElementById('root'))
+
+root.render(
+  <QueryParamProvider>
+    <App />
+  </QueryParamProvider>
+)
 
 // Updating to React v18
 // https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html#updates-to-client-rendering-apis