mudanca 1 b1
merge com conflito resolvido