changements ramon
fixed merge