diff --git a/js_modules/dagster-ui/packages/ui-core/src/search/SearchDialog.tsx b/js_modules/dagster-ui/packages/ui-core/src/search/SearchDialog.tsx
index bf5bcd37a915b..0d82120a45eec 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/search/SearchDialog.tsx
+++ b/js_modules/dagster-ui/packages/ui-core/src/search/SearchDialog.tsx
@@ -318,74 +318,18 @@ export const SearchDialog = ({
transitionDuration={100}
>
-<<<<<<< HEAD
{searchInput}
{searchResults}
-=======
-
-
-
- {loading ? : null}
-
-
->>>>>>> 60e496c9bd (display filter results & bold matches)
>
);
} else {
return (
-<<<<<<< HEAD
{searchInput}
{searchResults}
-=======
-
-
-
-
- {loading ? : null}
-
-
-
-
-
->>>>>>> 60e496c9bd (display filter results & bold matches)
);
}
};