diff --git a/htdocs/forms.php b/htdocs/forms.php
index 8bfc11cd4936a2ac399d87c371c99e31de6a2912..3bc3221c23a01433e0c9c895091b00e2ec408d6a 100644
--- a/htdocs/forms.php
+++ b/htdocs/forms.php
@@ -323,8 +323,12 @@ function match($student, $userRepository) {
         $nameProf = $match["teacher"]->getName();
         $subject = $match["subject"];
         $dispo = $match["dispo"];
+<<<<<<< HEAD
         $mail = $match["mail"];
         echo "Le professeur <b>$firstnameProf $nameProf</b> est disponible pour un cours de <b>$subject</b> le <b>$dispo</b> et son mail est <b>$mail</b> </br>";
+=======
+        echo "Le professeur <b>$firstnameProf $nameProf</b> est disponible pour un cours de <b>$subject</b> le <b>$dispo</b>.</br>";
+>>>>>>> 8f529a4815643ab9298439c4796f7d7e21e15266
     }
 }