Signed-off-by: Eric <eric_freitas@hotmail.com>
removendo settings e arrumando conflitos