diff --git a/frontend/src/lib/components/DisplayResult.svelte b/frontend/src/lib/components/DisplayResult.svelte
index 58af2b6d4f..71e1f96524 100644
--- a/frontend/src/lib/components/DisplayResult.svelte
+++ b/frontend/src/lib/components/DisplayResult.svelte
@@ -11,17 +11,10 @@
import Alert from './common/alert/Alert.svelte'
import AutoDataTable from './table/AutoDataTable.svelte'
import Markdown from 'svelte-exmarkdown'
-<<<<<<< Updated upstream
import Toggle from './Toggle.svelte'
import FileDownload from './common/fileDownload/FileDownload.svelte'
-=======
- import { HelpersService } from '$lib/gen'
- import { workspaceStore } from '$lib/stores'
+
import ParqetTableRenderer from './ParqetTableRenderer.svelte'
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
export let result: any
export let requireHtmlApproval = false
diff --git a/frontend/src/lib/components/ParqetTableRenderer.svelte b/frontend/src/lib/components/ParqetTableRenderer.svelte
index 162e72a2a2..2bcc46ee10 100644
--- a/frontend/src/lib/components/ParqetTableRenderer.svelte
+++ b/frontend/src/lib/components/ParqetTableRenderer.svelte
@@ -116,7 +116,7 @@