<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7eb7bf7 (Fix queue badge showing on printers without matching filament (#486)) ======= ======= >>>>>>> 1eeeb37 ( Updated commit message (now includes the test fix):) ======= >>>>>>> 65c904b ( Fix sidebar navigation not respecting user permissions) >>>>>>> ce97a47 ( Add H2C dual nozzle variant O1C2 model support (#489))