diff --git a/Project/adminBlazor/adminBlazor/Factories/VocListFactory.cs b/Project/adminBlazor/adminBlazor/Factories/VocListFactory.cs
index db120a7..2e99be6 100644
--- a/Project/adminBlazor/adminBlazor/Factories/VocListFactory.cs
+++ b/Project/adminBlazor/adminBlazor/Factories/VocListFactory.cs
@@ -39,6 +39,9 @@ namespace adminBlazor.Factories
 
             if (voc.ImageBase64 != null && voc.Image != null)
                 item.ImageBase64 = Convert.ToBase64String(voc.Image);
+
+            if (voc.Aut != null)
+                item.Aut = voc.Aut;
         }
 
     }
diff --git a/Project/adminBlazor/adminBlazor/Pages/EditVoc.razor b/Project/adminBlazor/adminBlazor/Pages/EditVoc.razor
index c227c9f..1f7773f 100644
--- a/Project/adminBlazor/adminBlazor/Pages/EditVoc.razor
+++ b/Project/adminBlazor/adminBlazor/Pages/EditVoc.razor
@@ -11,12 +11,30 @@
         <DataAnnotationsValidator />
         <ValidationSummary />
 
+<<<<<<< HEAD
         <p>
             <label for="nom">
                 Name :
                 <InputText id="nom" @bind-Value="voc.Name" />
             </label>
         </p>
+=======
+    <p>
+        <label for="name">
+            Name:
+            <InputText id="name" @bind-Value="voc.Name" />
+            <ValidationMessage For="@(() => voc.Name)" />
+        </label>
+
+    </p>
+    <p>
+        <label>
+            Author
+            <InputNumber @bind-Value="voc.Aut" />
+            <ValidationMessage For="@(() => voc.Aut)" />
+        </label>
+    </p>
+>>>>>>> e13ce594471ea79c152b246fc51c65544632624d
 
         <button type="submit">Submit</button>
     </EditForm>
diff --git a/Project/adminBlazor/adminBlazor/Pages/EditVoc.razor.cs b/Project/adminBlazor/adminBlazor/Pages/EditVoc.razor.cs
index c3e73dc..b619aa5 100644
--- a/Project/adminBlazor/adminBlazor/Pages/EditVoc.razor.cs
+++ b/Project/adminBlazor/adminBlazor/Pages/EditVoc.razor.cs
@@ -31,7 +31,7 @@ namespace adminBlazor.Pages
         {
             await VocListService.Update(Id, voc);
 
-            NavigationManager.NavigateTo("list");
+            NavigationManager.NavigateTo("voc");
         }
         
         private async Task LoadImage(InputFileChangeEventArgs e)