diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 27631d7f..de8581ad 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -2197,7 +2197,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         return null;
     }
 
-<<<<<<< HEAD
     public function updateVehicleBattery(JobOrder $jo)
     {
         // check if new battery