diff --git a/view/iexplorer-to-call-log.php b/view/iexplorer-to-call-log.php
index 051f7ce..65d2f5e 100644
--- a/view/iexplorer-to-call-log.php
+++ b/view/iexplorer-to-call-log.php
@@ -32,15 +32,10 @@
 		$response = $request->dispatch();
 
 		// Si erreur, on l'affiche
-<<<<<<< HEAD
-		if( $response->error != ManagerError::Success )
-			var_dump( ManagerError::explicit($response->error) );
-=======
 		if( $response->error != ManagerError::Success ){
 			var_dump( ManagerError::explicit($response->error) );
 			exit();
 		}
->>>>>>> feature/convert-iexplorer-to-calllog
 
 		// On récupère les données
 		$logs = $response->get('data');