fixing branch labo1 and Labo2