@Anton - acum merge