diff --git a/src/displays/menus/settingsmenu.h b/src/displays/menus/settingsmenu.h
index 34dab16..2deaae1 100644
--- a/src/displays/menus/settingsmenu.h
+++ b/src/displays/menus/settingsmenu.h
@@ -32,7 +32,6 @@ class MainMenu;
 }
 
 namespace {
-#ifdef GLUMP_CONTROLLER
 class SettingsMenu;
 using BluetoothModeChangeDisplay = makeComponent<
     ChangeValueDisplay<BluetoothMode>,
@@ -42,6 +41,7 @@ using BluetoothModeChangeDisplay = makeComponent<
     SwitchScreenAction<SettingsMenu>
 >;
 
+#ifdef GLUMP_CONTROLLER
 struct FrontLedAccessor : public RefAccessor<bool> { bool &getRef() const override { return front.command.led; } };
 struct BackLedAccessor : public RefAccessor<bool> { bool &getRef() const override { return back.command.led; } };
 #endif
@@ -59,7 +59,6 @@ class SettingsMenu :
 #endif
         makeComponent<MenuItem, StaticText<TEXT_CONTROLLERHARDWARESETTINGS>,    SwitchScreenAction<ControllerHardwareSettingsMenu>, StaticMenuItemIcon<&icons::hardware>>,
         makeComponent<MenuItem, StaticText<TEXT_BOARDCOMPUTERHARDWARESETTINGS>, SwitchScreenAction<BoardcomputerHardwareSettingsMenu>, StaticMenuItemIcon<&icons::hardware>>,
-#endif
         makeComponent<MenuItem, StaticText<TEXT_BLUETOOTHMODE>,                 SwitchScreenAction<BluetoothModeChangeDisplay>>,
 #ifdef FEATURE_BMS
         makeComponent<MenuItem, StaticText<TEXT_AUTOCONNECTBMS>,                ToggleBoolAction, CheckboxIcon, AutoConnectBmsAccessor>,
diff --git a/src/displays/statusdisplay.h b/src/displays/statusdisplay.h
index 84ad504..ac6b381 100644
--- a/src/displays/statusdisplay.h
+++ b/src/displays/statusdisplay.h
@@ -168,17 +168,11 @@ void StatusDisplay::initScreen()
     m_labelLimit0.start();
     tft.drawString("IP:", 0, bottomLines[1]);
     m_labelIpAddress.start();
-<<<<<<< HEAD
+#ifdef GLUMP_CONTROLLER
     tft.drawString("Limit1:", 160, bottomLines[1]);
     m_labelLimit1.start();
-    tft.drawString("Performance:", 0, bottomLines[2]);
-=======
-#ifdef GLUMP_CONTROLLER
-    tft.drawString("Limit1:", 160, 281);
-    m_labelLimit1.start();
 #endif
-    tft.drawString("Performance:", 0, 296);
->>>>>>> b343056... vesc control
+    tft.drawString("Performance:", 0, bottomLines[2]);
     m_labelPerformance.start();
     tft.drawString("Mode:", 125, bottomLines[2]);
     m_labelMode.start();