french fix
merge