fix: oops

Author: nicoalee

compose/neurosynth-frontend/src/pages/Study/components/EditStudyAnnotationsHotTable.tsx

@@ -72,26 +72,6 @@ const EditStudyAnnotationsHotTable: React.FC<{ readonly?: boolean }> = ({ readon
     }, [data]);
 
     return (
-<<<<<<< HEAD
-        <Box sx={{ width: '100%', height: '100%' }}>
-            <HotTable
-                {...HotSettings}
-                afterChange={handleAfterChange}
-                beforePaste={handleBeforePaste}
-                width="100%"
-                height="auto"
-                stretchH="all"
-                hiddenRows={{
-                    rows: hiddenRows,
-                    indicators: false,
-                }}
-                colWidths={colWidths}
-                columns={columns}
-                colHeaders={colHeaders}
-                data={memoizedData}
-                ref={hotTableRef}
-            />
-=======
         <Box>
             {canEdit && !readonly && (
                 <Box
@@ -136,7 +116,6 @@ const EditStudyAnnotationsHotTable: React.FC<{ readonly?: boolean }> = ({ readon
                     ref={hotTableRef}
                 />
             </Box>
->>>>>>> FEAT-1075-extraction-add-a-new-annotation-column-in-the-study-view
         </Box>
     );
 };