more beautiful accueil
Fix conflict