bad merge is fixed

Signed-off-by: David Saldana <dajulian@gmail.com>