deuxieme version encore mieuz
resolved conflict