petites modifs
ok
merge fix