merge last changes to my branch