diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c
index 7f6b62a499..721b1b8d4b 100644
--- a/src/main/sensors/battery.c
+++ b/src/main/sensors/battery.c
@@ -292,6 +292,7 @@ void updateCurrentMeter(int32_t lastUpdateAt, rxConfig_t *rxConfig, uint16_t dea
             break;
         case CURRENT_SENSOR_ESC:
             #ifdef USE_ESC_SENSOR
+<<<<<<< 2af7ff8434cfe047c841c85aae300154c7b4065e
             if (feature(FEATURE_ESC_SENSOR))
             {
                 amperage = getEscSensorCurrent();
@@ -299,6 +300,12 @@ void updateCurrentMeter(int32_t lastUpdateAt, rxConfig_t *rxConfig, uint16_t dea
             }
             #endif
 
+=======
+            if (batteryConfig->currentMeterType == CURRENT_SENSOR_ESC) {
+                amperage = getEscSensorCurrent();
+                mAhDrawn = getEscSensorConsumption();
+            }
+>>>>>>> Fixed Travis build warning
             break;
         case CURRENT_SENSOR_NONE:
             amperage = 0;