Pacote
Conflito resolvido