merge last changes