modif repo variable
conflict solved