commit mudaca 2
modificao 2, conflito resolvido