Fixed merge conflicts

Author: stylesuxx

src/features/root/Root.jsx

@@ -332,7 +332,7 @@ export default function Root() {
             disconnected.current = true;
             break;
           } else if(e instanceof PatchFailed) {
-            log(t("manualReboot"));
+            log(t("tryButter"));
 
             ReactGA.gtag("event", "patchFailed", {
               device,

src/translations/en/root.json

@@ -14,6 +14,7 @@
   "step5Reboot": "Step 5 - Success! Rebooting...",
   "done": "All done - your device has been successfully rooted!",
   "manualReboot": "Failed! Please power cycle your device now...",
+  "tryButter": "Failed! Your firmware might not be rootable, please try downgrading with <a href=\"https://github.com/fpv-wtf/butter\">Butter</a>.",
   "failed": "Failed after {{maxTry}} retries.",
   "deviceLost": "Device went away...",
   "deviceBack": "Device came back...",