Removing rubish left from the merge operation

Signed-off-by: Renato Stoffalette Joao <renatosjoao@gmail.com>