diff --git a/assets/scripts/php2ics.php b/assets/scripts/php2ics.php
index 9bd1003..92db461 100644
--- a/assets/scripts/php2ics.php
+++ b/assets/scripts/php2ics.php
@@ -143,14 +143,8 @@ if(isset($_POST['download_planning'])) {
 
     $cal->End();
   
-<<<<<<< HEAD
    	$cal->DownloadICS("planning_SA_INSA");
-=======
-    $req = $db->prepare('UPDATE planning_tmp_dl set planning = ?');
-    $req->execute(array($cal->GetICS()));
 
-   	header('Location: assets/scripts/planning_tmp.php');
->>>>>>> 2ca75a7bb394da5df40132b30b562ab0bdd8552e
 }
 
 ?>
\ No newline at end of file