merge
add validation fr