diff --git a/README.md b/README.md
index e0c8019..57d0e32 100644
--- a/README.md
+++ b/README.md
@@ -44,11 +44,7 @@
 
 - [x] davfs mount
 
-<<<<<<< HEAD
 - [X] VM server
-=======
-- [x] VM server
->>>>>>> 7b617622d298e2f5abac73c6aeeeeb5bc636d25b
 
 - [X] syncthing role
 
@@ -63,26 +59,19 @@
 
 - [X] workstation role
 - -need to check for nvidia drver
-- [ ] cups
+- [X] cups
 - [ ] bluetooth et tlp pour laptop
   
-- [ ] grubtheme
+- [X] grubtheme
 
 
 ### 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 ad48a2f..a4a7eb6 100644
--- a/workstation.yml
+++ b/workstation.yml
@@ -6,6 +6,7 @@
   - mpd
   - virt
   - workstation
+  - cups
   - grub_themes
 - hosts: laptop
   roles: