merge with branch gestion (based on alexander)