diff --git a/web/src/pages/ConfigEditor.tsx b/web/src/pages/ConfigEditor.tsx
index 1f265428c..364c13252 100644
--- a/web/src/pages/ConfigEditor.tsx
+++ b/web/src/pages/ConfigEditor.tsx
@@ -16,11 +16,8 @@ import { MdOutlineRestartAlt } from "react-icons/md";
 import RestartDialog from "@/components/overlay/dialog/RestartDialog";
 import { useTranslation } from "react-i18next";
 import { useRestart } from "@/api/ws";
-<<<<<<< HEAD
 import { useResizeObserver } from "@/hooks/resize-observer";
-=======
 import { FrigateConfig } from "@/types/frigateConfig";
->>>>>>> 5f40e6e2 (Add basic config editor when Frigate can't startup (#18383))
 
 type SaveOptions = "saveonly" | "restart";