From ccf9407127b6ed0ecb43ef79de4681d7945d8bc5 Mon Sep 17 00:00:00 2001
From: Marc Brooks <IDisposable@gmail.com>
Date: Mon, 10 Nov 2025 16:42:57 -0600
Subject: [PATCH] Fix merge error

useFailsafeModeStore comes from stores.js not messages.
---
 ui/src/routes/devices.$id.settings.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/routes/devices.$id.settings.tsx b/ui/src/routes/devices.$id.settings.tsx
index 70827fff..f82b489b 100644
--- a/ui/src/routes/devices.$id.settings.tsx
+++ b/ui/src/routes/devices.$id.settings.tsx
@@ -16,12 +16,12 @@ import {
 } from "react-icons/lu";
 
 import { cx } from "@/cva.config";
-import { useUiStore } from "@hooks/stores";
+import { useUiStore, useFailsafeModeStore } from "@hooks/stores";
 import Card from "@components/Card";
-import { LinkButton } from "@components/Button";
-import { FeatureFlag } from "@components/FeatureFlag";
-import { m, useFailsafeModeStore } from "@localizations/messages.js";
 import { FailsafeModeBanner } from "@components/FailSafeModeBanner";
+import { FeatureFlag } from "@components/FeatureFlag";
+import { LinkButton } from "@components/Button";
+import { m } from "@localizations/messages.js";
 
 /* TODO: Migrate to using URLs instead of the global state. To simplify the refactoring, we'll keep the global state for now. */
 export default function SettingsRoute() {