change

Signed-off-by: Maksim Shmukler <m.shmukler@gmail.com>
fixed merge