Fixed merge issues

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>