missing merge conflicts.

frontend/components/datagrids/measurementscommons.tsx

@@ -273,6 +273,7 @@ export default function MeasurementsCommons(props: Readonly<MeasurementsCommonsP
     snackbar,
     setSnackbar,
     refresh,
+    setRefresh,
     paginationModel,
     setPaginationModel,
     isNewRowAdded,

frontend/config/utils.ts

@@ -118,13 +118,9 @@ export function createSelectQuery<Result>(schema: string, tableName: string, whe
     .map(key => `\`${key}\` = ?`) // Escaping column names with backticks
     .join(' AND ');
 
-<<<<<<< HEAD
-  return `SELECT * FROM \`${schema}\`.\`${tableName}\` WHERE ${whereConditions} ${limiter ? `LIMIT ${limiter}` : ``}`;
-=======
   return `SELECT *
           FROM \`${schema}\`.\`${tableName}\`
           WHERE ${whereConditions} ${limiter ? `LIMIT ${limiter}` : ``}`;
->>>>>>> development-hotfixes
 }
 
 export function createInsertOrUpdateQuery<Result>(schema: string, tableName: string, data: Partial<Result>): string {
@@ -180,11 +176,6 @@ export async function handleUpsert<Result>(
     console.log('query: ', query);
     console.log('values: ', Object.values(data));
     const result = await connectionManager.executeQuery(query, Object.values(data));
-<<<<<<< HEAD
-    console.log('result: ', result);
-
-=======
->>>>>>> development-hotfixes
     id = result.insertId;
 
     if (id === 0) {
@@ -224,11 +215,7 @@ export async function handleUpsert<Result>(
       console.log('values: ', Object.values(values));
 
       const searchResult = await connectionManager.executeQuery(findExistingQuery, values);
-<<<<<<< HEAD
-      console.log('search result: ', searchResult);
-=======
       console.log('find existing query search result: ', searchResult);
->>>>>>> development-hotfixes
 
       if (searchResult.length > 0) {
         id = searchResult[0][key as keyof Result] as unknown as number;
@@ -241,15 +228,8 @@ export async function handleUpsert<Result>(
 
     return { id, operation: 'inserted' };
   } catch (e: any) {
-<<<<<<< HEAD
-    console.log('error in handleUpsert: ', e.message);
-    process.exit(0);
-    createError(e.message, e);
-=======
     console.error('Error in handleUpsert:', e.message, 'Stack:', e.stack);
-    process.exit(0);
     throw createError(e.message, e);
->>>>>>> development-hotfixes
   }
 }