my modif
solved merge conflicts