desafio 3 rearrumado
merge and soved conflicts