move completely set !
fix merge pb