solved conflict of master and gh pages

Signed-off-by: filipe garcia <filipe.c.garcia@gmail.com>