Fix merge errors

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>