diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html
index bd096f83968a4b95746fc522e017d0a704d232aa..c5674563502f75362e3e63353477ff3f0206874a 100644
--- a/src/app/signup/student-signup/student-signup.component.html
+++ b/src/app/signup/student-signup/student-signup.component.html
@@ -33,10 +33,7 @@
       </mat-hint>
     </mat-form-field>
 
-<<<<<<< HEAD
 
-=======
->>>>>>> donnees_personnelles
     <p>
       Il ne te reste plus qu'à choisir un mot de passe. :-)
     </p>
@@ -67,4 +64,4 @@
       J'ai déjà un compte ! <a routerLink="/connexion">Me connecter</a>
     </p>
   </form>
-</app-form-page>
\ No newline at end of file
+</app-form-page>