diff --git a/gestion_salle/static/gestion_salle/js/index.js b/gestion_salle/static/gestion_salle/js/index.js
index 8c43fb4..9bbd201 100644
--- a/gestion_salle/static/gestion_salle/js/index.js
+++ b/gestion_salle/static/gestion_salle/js/index.js
@@ -15,10 +15,6 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
         .then(response => response.json())
         .then(data => {
             currentReservationId = data.id_reservation;
-<<<<<<< HEAD
-=======
-            console.log(data);
->>>>>>> c28b14f (clean: remove pycache from tracking)
             $("id_reservation_detail").value = data.id_reservation;
             $("id_reservation_refus").value = data.id_reservation;
             $("id_reservation_zoom").value = data.id_reservation;
@@ -33,13 +29,10 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
             $("besoin_ordinateur").checked=data.besoin_ordinateur;
             $("lien_zoom").value=data.lien_zoom;
 
-<<<<<<< HEAD
             if (data.besoin_zoom === false){
                 $("lien_zoom_container").className = "d-none";
             }
 
-=======
->>>>>>> c28b14f (clean: remove pycache from tracking)
             if(data.statut !== "annulee"){
                 $("motif_refus_container").className = "d-none";
             }else{
@@ -177,16 +170,6 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => {
         $("lien_zoom_container").className = 'd-none';
     }
 
-<<<<<<< HEAD
-    // if(data.statut !== "refusee"){
-    //     $("motif_refus_container").className = 'd-none';
-    // }
-=======
-    if(data.statut !== "refusee"){
-        $("motif_refus_container").className = 'd-none';
-    }
->>>>>>> c28b14f (clean: remove pycache from tracking)
-
     $("id_reservation_detail").value = data.id;
     $("id_reservation_refus").value = data.id;
     $("id_reservation_zoom").value = data.id;
@@ -194,23 +177,15 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => {
     $("employe").value=data.employe;
     $("salle").value=data.salle;
     $("statut-reservation").innerHTML=data.statut;
-<<<<<<< HEAD
     $("date_debut").value = data.date_debut;
     $("date_fin").value = data.date_fin;
-=======
-    $("date_evenement").value=data.date_debut;
->>>>>>> c28b14f (clean: remove pycache from tracking)
+
     $("heure_debut").value=data.heure_debut;
     $("heure_fin").value=data.heure_fin;
     $("motif_reservation").value=data.motif_reservation;
     $("besoin_zoom").checked=data.besoin_zoom;
     $("besoin_ordinateur").checked=data.besoin_ordi;
     $("lien_zoom").value=data.lien_zoom;
-<<<<<<< HEAD
-    // $("motif_refus").value=data.motif_refus;
-=======
-    $("motif_refus").value=data.motif_refus;
->>>>>>> c28b14f (clean: remove pycache from tracking)
 
     const modal = new bootstrap.Modal($("modalDetailReservation"));
     bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide();
diff --git a/gestion_salle/views.py b/gestion_salle/views.py
index 11503d3..495d33d 100644
--- a/gestion_salle/views.py
+++ b/gestion_salle/views.py
@@ -8,6 +8,9 @@ from fonction_utilitaire import fonctions_utilitaire
 from gestion_employe.models import Employe
 from gestion_salle.forms import ReservationForm
 from .models import Reservation
+from datetime import timedelta
+from django.contrib.auth.models import User
+
 
 
 @login_required