modif ayoub
conflict resolve