diff --git a/.gitignore b/.gitignore
index 39533c4..4de308e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ staticfiles/
 migrations/
 __pycache__/
 *.pyc
-db.sqlite3
\ No newline at end of file
+db.sqlite3
diff --git a/gestion_employe/static/gestion_employe/js/index.js b/gestion_employe/static/gestion_employe/js/index.js
index 1039240..e3056c8 100644
--- a/gestion_employe/static/gestion_employe/js/index.js
+++ b/gestion_employe/static/gestion_employe/js/index.js
@@ -12,10 +12,7 @@ const tableau_liste_employe = new Tabulator("#tableau_liste_employe", {
     // ajaxURL: url_liste_employe,
     pagination: true,
     paginationSize: 10,
-<<<<<<< HEAD
     responsiveLayout : "hide"
-=======
->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
 })
 
 fetch(url_liste_employe)
@@ -264,11 +261,8 @@ const listeContratExpirant = new Tabulator("#listeContratExpirant", {
         },
     ],
     ajaxURL: $("boutonContratExpirants").dataset.urlexpirants,
-<<<<<<< HEAD
 })
 
-
-
 let tabContrats = null;
 
 document.getElementById("modalContratsEmploye")
@@ -339,6 +333,3 @@ document.getElementById("modalContratsEmploye")
 });
 
 
-=======
-})
->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
diff --git a/gestion_salle/templates/gestion_salle/index.html b/gestion_salle/templates/gestion_salle/index.html
index 88bc720..db35f40 100644
--- a/gestion_salle/templates/gestion_salle/index.html
+++ b/gestion_salle/templates/gestion_salle/index.html
@@ -26,15 +26,9 @@
                 <div class="form-group col-5 me-2">
                     <label>Selectionner une salle :</label>
                     <select class = "form-select" id="liste-salle">
-<<<<<<< HEAD
                         <option value='Salle de formation'>Salle de formation</option>
                         <option value='Salle de réunion'>Salle de réunion</option>
                         <option value='Lien Zoom'>Lien Zoom</option>
-=======
-                        <option value='formation'>Salle de formation</option>
-                        <option value='reunion'>Salle de réunion</option>
-                        <option value='lien_zoom'>Lien Zoom</option>
->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
                     </select>
                 </div>
             </div>
diff --git a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
index 73a523f..379dcd9 100644
--- a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
+++ b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
@@ -1,8 +1,5 @@
 <!-- Modal d'affichage des détails d'une reservation -->
-<<<<<<< HEAD
 {% load tags_personnaliser %}
-=======
->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
 <div class="modal fade" id="modalDetailReservation" tabindex="-1" aria-labelledby="modalDetailReservationLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -25,11 +22,7 @@
                         <input class="form-control" id="salle"  readonly>
                     </div>
                     <div class="form-group mb-2">
-<<<<<<< HEAD
-                        <label>Date de debut :</label>
-=======
                         <label>Date de l'évènement :</label>
->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
                         <input type='date' class="form-control" id="date_evenement" readonly >
                     </div>
                     <div class="form-group mb-2">
@@ -53,7 +46,6 @@
                         <input type="url" class="form-control" id="lien_zoom" readonly >
                     </div>
                     <div class="form-check mb-2">
-<<<<<<< HEAD
                         <label class="form-check-label">Besoin d'un ordinateur</label>
                         <input type="checkbox" class="form-check-input" id="besoin_ordinateur" readonly >
                     </div>
@@ -67,33 +59,9 @@
                         {% endif %}
                         <span id="current-user-id" data-user-id="{{ request.user.id }}"></span>
                         <button class="btn btn-danger" id="bouton-annuler">Annuler</button>
-=======
-                        <label label="form-check-label">Besoin d'un ordinateur</label>
-                        <input type="checkbox" class="form-check-input" id="besoin_ordinateur" readonly >
-                    </div>
-                    <div class="form-group mb-2" id='motif_refus_container'>
-                        <label>Motif de refus de la reservation :</label>
-                        <textarea class="form-control"  id="motif_refus" readonly></textarea>
-                    </div>
-                    <div class='d-flex justify-content-around mt-2'>
-                        {% if appartient_au_departement_informatique %}
-                        <button class="btn btn-primary" id="ajoutZoom">Ajout du lien zoom</button>
-                        {% endif %}
-                        {% if appartient_direction  and  reservation.statut == "en_attente" %}
-                        <button class="btn btn-danger" id="refuserReservation" data-lienrefus="{% url 'gestion_salle:refuser-reservation' %}">Refuser</button>
-                        {% endif %}
-                            <button class="btn btn-danger" id="bouton-annuler">Annuler</button>
-                        {% if appartient_direction %}
-                        <button class="btn btn-success" id="bouton-valider">Valider</button>
-                        {% endif %}
->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
                     </div>
                 </form>
             </div>
         </div>
     </div>
-<<<<<<< HEAD
 </div> 
-=======
-</div>
->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)