Fixed merge error

Signed-off by: Diego Araújo <diegoamc90@gmail.com>