Fix merge problems ...

... do not know why but some merging failed !