trivial: merge conflict fix

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>