Merge last changes