deduplication query fix and UI changes

Author: aashipandya

backend/src/graphDB_dataAccess.py

@@ -362,7 +362,7 @@ def get_duplicate_nodes_list(self):
         score_value = float(os.environ.get('DUPLICATE_SCORE_VALUE'))
         text_distance = int(os.environ.get('DUPLICATE_TEXT_DISTANCE'))
         query_duplicate_nodes = """
-                MATCH (n:!Chunk&!Session&!Document&!`__Community__`&!`__Entity__`) with n 
+                MATCH (n:!Chunk&!Session&!Document&!`__Community__`) with n 
                 WHERE n.embedding is not null and n.id is not null // and size(toString(n.id)) > 3
                 WITH n ORDER BY count {{ (n)--() }} DESC, size(toString(n.id)) DESC // updated
                 WITH collect(n) as nodes

frontend/src/components/Graph/GraphViewModal.tsx

@@ -349,15 +349,7 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
           'aria-labelledby': 'form-dialog-title',
         }}
       >
-<<<<<<< HEAD
         <Dialog.Header htmlAttributes={{ id: 'graph-title' }}>
-=======
-        <Dialog.Header
-          htmlAttributes={{
-            id: 'graph-title',
-          }}
-        >
->>>>>>> 6a46472dcebfb9282c1c9d7332bcfacb30811661
           {headerTitle}
           {viewPoint !== graphLabels.chatInfoView && (
             <div style={{ display: 'flex', alignItems: 'center' }}>
@@ -411,11 +403,7 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
                       }}
                       nvlCallbacks={nvlCallbacks}
                     />
-<<<<<<< HEAD
                     <IconButtonArray orientation='vertical' isFloating={true} className='absolute bottom-4 right-4'>
-=======
-                    <IconButtonArray orientation='vertical' isFloating className='absolute bottom-4 right-4'>
->>>>>>> 6a46472dcebfb9282c1c9d7332bcfacb30811661
                       {viewPoint !== 'chatInfoView' && (
                         <IconButtonWithToolTip
                           label='Refresh'

frontend/src/components/UI/ErrroBoundary.tsx

@@ -19,11 +19,7 @@ export default class ErrorBoundary extends React.Component<any, any> {
       return (
         <div className='n-size-full n-flex n-flex-col n-items-center n-justify-center n-rounded-md n-bg-palette-neutral-bg-weak n-box-border'>
           <Banner
-<<<<<<< HEAD
             hasIcon={true}
-=======
-            hasIcon
->>>>>>> 6a46472dcebfb9282c1c9d7332bcfacb30811661
             type='info'
             description={
               this.state.errorMessage === 'Missing required parameter client_id.'
@@ -53,11 +49,7 @@ export default class ErrorBoundary extends React.Component<any, any> {
                     },
                   ]
             }
-<<<<<<< HEAD
             usage='inline'
-=======
-            usage='global'
->>>>>>> 6a46472dcebfb9282c1c9d7332bcfacb30811661
           ></Banner>
         </div>
       );