partial merge of dev to master

src/components/App.js

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-import React, { useState, useEffect, useMemo, useRef } from "react";
-=======
 import React, { useState, useEffect, useMemo } from "react";
->>>>>>> dev
 import {
   Container,
   Box,
@@ -33,22 +29,12 @@ import postData from "../utilities/postData";
 import { useData } from "../contexts/DataContext";
 import { utils as XLSXutils, writeFile as XLSXwriteFile } from "xlsx";
 import ReactGA from "react-ga4";
-<<<<<<< HEAD
-import CookieConsent from "react-cookie-consent";
+import CookieConsent, { getCookieConsentValue } from "react-cookie-consent";
 import { ToastContainer, toast } from "react-toastify";
-import "react-toastify/dist/ReactToastify.css";
 import MakeMeJSON from "./MakeMeJSON.js";
-=======
-import CookieConsent, {
-  Cookies,
-  getCookieConsentValue,
-} from "react-cookie-consent";
-import { ToastContainer, toast } from "react-toastify";
 import "react-toastify/dist/ReactToastify.css";
->>>>>>> dev
 
 function App() {
-  // const fileInfos = useRef();
   const [existingInstruments, setExistingInstruments] = useState([]);
   const [apiData, setApiData] = useState({});
   const [resultsOptions, setResultsOptions] = useState({
@@ -61,22 +47,7 @@ function App() {
   const { storeHarmonisation, reportRating } = useData();
   const [ratingValue, setRatingValue] = useState();
   const [computedMatches, setComputedMatches] = useState();
-<<<<<<< HEAD
-  const [fileInfos, setFileInfos] = useState([]);
-  /* const getFileInfos = () => {
-    console.log(
-      "getting FileInfos from App " + JSON.stringify(fileInfos)
-    );
-    return fileInfos || [];
-  };
-  const setFileInfos = (fi) => {
-    console.log("setting FileInfos in App " + JSON.stringify(fi));
-    fileInfos = fi;
-  };
- */
-=======
-
->>>>>>> dev
+  const [fileInfos, setFileInfos] = useState();
   useEffect(() => {
     setMode(prefersDarkMode ? "dark" : "light");
   }, [prefersDarkMode]);