diff --git a/src/app/members/student-home/student-home.component.html b/src/app/members/student-home/student-home.component.html
index f5adf0206aec4fde495d0d9569b8557edfeb2bf7..540c5f14f01be246773ff3ad286235f400a58f6b 100644
--- a/src/app/members/student-home/student-home.component.html
+++ b/src/app/members/student-home/student-home.component.html
@@ -12,11 +12,7 @@
   <app-pane id="account">
     <account-overview class="pane-content"></account-overview>
   </app-pane>
-<<<<<<< HEAD
-</app-two-panes>
-=======
 </app-three-panes>
->>>>>>> donnees_personnelles
 
 <div class="container">
   <h2>