merge les 2 branches