merge for work

I don't know if it's the righ way to do it