merge modif alexis