Revert "resolvido conflito"

This reverts commit ad4350b14ff3f4408cdb7ae2b8dec99e183bef36.
Revert "Revert "resolvido conflito""

This reverts commit c18bef9057bc17360e8dee8956858c98a130dc51.