vaccin init OK
edit vaccin mode
fix merge conflicts