diff --git a/cronjob.php b/cronjob.php
index 5c0402d..0128147 100644
--- a/cronjob.php
+++ b/cronjob.php
@@ -62,17 +62,12 @@ foreach ($communications as $communication){
 $token ='';
 
 $data = json_encode(array("username" => interface_user, "password" => interface_pw), JSON_UNESCAPED_UNICODE);
-<<<<<<< HEAD
-=======
-
->>>>>>> development
 //Secure data
 $payload = generate_payload($data);
 //API call
 $responses = ioServer('/v1/authorization', $payload);
 //Decode Payload
 if (!empty($responses)){$responses = decode_payload($responses);}else{$responses = '400';}
-<<<<<<< HEAD
 
 if ($responses === 'NOK' || $responses === '400'){
   //Not allowed
@@ -102,33 +97,6 @@ storeMeasurementProduct($total_results, $token);
 storeMeasurementEquipment('');
 
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-=======
-
-if ($responses === 'NOK' || $responses === '400'){
-  //Not allowed
-  http_response_code(403);
-  exit;
-} 
-else { 
-  // Store data in session
-  $token = $responses->userkey;
-}
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// close Contracts                          ++++++++++++++
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-closeContract();
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// Machine learning                         ++++++++++++++
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-$total_measurement = traintotalMeasurement();
-$total_results = statisticalAnalyses($total_measurement);
-storeMeasurementProduct($total_results, $token);
-storeMeasurementEquipment('');
-
-// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
->>>>>>> development
 // GeoUpdate                                ++++++++++++++
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 geolocationUpdate($token);