diff --git a/src/Controller/RAPIController.php b/src/Controller/RAPIController.php
index 65352647..e583de75 100644
--- a/src/Controller/RAPIController.php
+++ b/src/Controller/RAPIController.php
@@ -651,16 +651,9 @@ class RAPIController extends Controller
         // TODO: this has to move to JOHandler
         $this->updateVehicleBattery($jo);
 
-<<<<<<< HEAD
-        // create warranty 
-        if ($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW)
-=======
-        $em->flush();
-
         // create warranty
         if (($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW) ||
             ($jo->getServiceType() == CMBServiceType::BATTERY_REPLACEMENT_NEW))
->>>>>>> 3e2d0db5cd7c0e67f7c41c61f98761d38e424adc
         {
             $serial = null;
             $warranty_class = $jo->getWarrantyClass();