fix merges

Signed-off-by: Humberto Borba <humberos@gmail.com>