add popup error
coucou
merge and resolve conflict + restaure bad modif