merge des versions

Signed-off-by: fabien chung <fabien.chung@ysance.com>