diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c
index 721b1b8d4..bf1b13941 100644
--- a/src/main/sensors/battery.c
+++ b/src/main/sensors/battery.c
@@ -84,17 +84,12 @@ static void updateBatteryVoltage(void)
     }
 
     #ifdef USE_ESC_SENSOR
-<<<<<<< 0a89e28c8e6e538d5b283fe9a389c481f24523fb
     if (feature(FEATURE_ESC_SENSOR) && batteryConfig->batteryMeterType == BATTERY_SENSOR_ESC) {
         vbatLatest = getEscSensorVbat();
         if (debugMode == DEBUG_BATTERY) {
             debug[0] = -1;
         }
         vbat = biquadFilterApply(&vBatFilter, vbatLatest);
-=======
-    if (batteryConfig->batteryMeterType == BATTERY_SENSOR_ESC) {
-        vbatSample = vbatLatest = getEscSensorVbat();
->>>>>>> Remove fallback on ADC sensor when ESC sensor fails
     }
     else
     #endif
@@ -292,7 +287,6 @@ 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();
@@ -300,12 +294,6 @@ 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;
diff --git a/src/main/sensors/battery.h b/src/main/sensors/battery.h
index 01309a8c8..8f0b1d65f 100644
--- a/src/main/sensors/battery.h
+++ b/src/main/sensors/battery.h
@@ -31,7 +31,8 @@ typedef enum {
     CURRENT_SENSOR_NONE = 0,
     CURRENT_SENSOR_ADC,
     CURRENT_SENSOR_VIRTUAL,
-    CURRENT_SENSOR_ESC
+    CURRENT_SENSOR_ESC,
+    CURRENT_SENSOR_MAX = CURRENT_SENSOR_ESC
 } currentSensor_e;
 
 typedef enum {