diff --git a/README.md b/README.md
index 788578e..e0c8019 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@
 ***launch ansible bootstrap***
 ` ansible-playbook -i nas, bootstrap.yml -u root --ask-pass`
 
-*** encrypt string**
-` ansible-vault encrypt_string `
+***encrypt string***
+`ansible-vault encrypt_string`
 
 
 ## Prerequis
@@ -38,13 +38,17 @@
   - create user
   - copy clé RSA
 
-- [X] samba automount role
+- [x] samba automount role
     - géré les credential en fichier
     - initialisé les variable pour les diferent périphérique
 
-- [X] davfs mount
+- [x] davfs mount
 
+<<<<<<< HEAD
 - [X] VM server
+=======
+- [x] VM server
+>>>>>>> 7b617622d298e2f5abac73c6aeeeeb5bc636d25b
 
 - [X] syncthing role
 
@@ -67,11 +71,18 @@
 
 ### Server Roles
 
+<<<<<<< HEAD
 - [server role]
   - cron
   - ssmtp
   - terminfo
   - controle du reboot
+=======
+- [ ] cron
+    - controle du reboot
+
+- [ ] ssmtp
+>>>>>>> 7b617622d298e2f5abac73c6aeeeeb5bc636d25b
 
 - [ ] rsyncd role
 
diff --git a/workstation.yml b/workstation.yml
index b874ae6..ad48a2f 100644
--- a/workstation.yml
+++ b/workstation.yml
@@ -6,6 +6,7 @@
   - mpd
   - virt
   - workstation
+  - grub_themes
 - hosts: laptop
   roles: