avace de avance jaja
conflict resolved