merge
phase 2 et prepare phase 3