diff --git a/views/lecture_page.php b/views/lecture_page.php
index 49cd0cc..d864d60 100644
--- a/views/lecture_page.php
+++ b/views/lecture_page.php
@@ -33,8 +33,5 @@ function planning_view(array $sauveteurs, array $creneaux, array $grille, string
 
 </body>
 </html>
-<<<<<<< Updated upstream
-=======
 <?php
-}
->>>>>>> Stashed changes
+