Fixing merge conflicts

Signed-off-by: Rostislav Khlebnikov <r.khlebnikov@gmail.com>