diff --git a/src/app/members/account/edit-data/edit-data.component.html b/src/app/members/account/edit-data/edit-data.component.html
index faf76ca44b3114ffa8696554d857b62676649659..819785b51375c36d181dab4409903732e5690940 100644
--- a/src/app/members/account/edit-data/edit-data.component.html
+++ b/src/app/members/account/edit-data/edit-data.component.html
@@ -76,6 +76,7 @@
                 <mat-option value="seconde">Seconde</mat-option>
                 <mat-option value="premiere" >Première</mat-option>
                 <mat-option value="terminale">Terminale</mat-option>
+                <mat-option value="classe passerelle">Classe Passerelle</mat-option>
               </mat-select>
             </mat-form-field>
 
@@ -84,6 +85,7 @@
               <mat-select  formControlName="classType" required>
                 <mat-option value="General">General</mat-option>
                 <mat-option value="Technologique">Technologique</mat-option>
+                <mat-option value="Professionnelle">Professionnelle</mat-option>
               </mat-select>
             </mat-form-field>
             
diff --git a/src/app/members/account/edit-data/edit-data.component.ts b/src/app/members/account/edit-data/edit-data.component.ts
index 01714e3de4a17ae2a977bb64ec67cbb7b4fa4387..34a1fb61158e392e151bd69802921b2a27946ab8 100644
--- a/src/app/members/account/edit-data/edit-data.component.ts
+++ b/src/app/members/account/edit-data/edit-data.component.ts
@@ -24,8 +24,10 @@ export class EditDataComponent implements OnInit {
   public possibleParentsStatus = [
     {id:"Mariés",name:"Mariés"},
     {id:"Divorcés",name:"Divorcés"},
+    {id:"Pacsés",name:"Pacsés"},
     {id:"En concubinage",name:"En concubinage"},
-    {id:"Famille Monoparentale",name:"Famille monoparentale"}
+    {id:"Famille Monoparentale",name:"Famille monoparentale"},
+    {id:"Autre",name:"Autre"}
   ]
 
   public possibleParentsActivities = [
@@ -60,7 +62,6 @@ export class EditDataComponent implements OnInit {
     {id:"echelon4",name:"Oui, échelon 4"},
     {id:"echelon5",name:"Oui, échelon 5"},
     {id:"echelon6",name:"Oui, échelon 6"},
-    {id:"echelon7",name:"Oui, échelon 7"},
     {id:"no",name:"Non"},
   ]
 
diff --git a/src/app/members/account/my-data/my-data.component.ts b/src/app/members/account/my-data/my-data.component.ts
index 5a7c5e3b792098fbc93e29588e81d04474cab039..08b27e436b58c0077c62abd42fb4ffe3708914e3 100644
--- a/src/app/members/account/my-data/my-data.component.ts
+++ b/src/app/members/account/my-data/my-data.component.ts
@@ -20,7 +20,8 @@ export class MyDataComponent implements OnInit {
     "troisieme": "Troisième",
     "seconde":"Seconde",
     "premiere":"Première",
-    "terminale":"Terminale"
+    "terminale":"Terminale",
+    "classe passerelle":"Classe Passerelle"
 
   }
   
@@ -42,7 +43,6 @@ export class MyDataComponent implements OnInit {
     "echelon4": "Oui, échelon 4",
     "echelon5": "Oui, échelon 5",
     "echelon6": "Oui, échelon 6",
-    "echelon7": "Oui, échelon 7",
     "no" : "Non"
 
   }
diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html
index 23e73c807456173ed609c6f318ae754fa8640140..bd096f83968a4b95746fc522e017d0a704d232aa 100644
--- a/src/app/signup/student-signup/student-signup.component.html
+++ b/src/app/signup/student-signup/student-signup.component.html
@@ -33,7 +33,10 @@
       </mat-hint>
     </mat-form-field>
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> donnees_personnelles
     <p>
       Il ne te reste plus qu'à choisir un mot de passe. :-)
     </p>