Revert "Reversão de conflito"

This reverts commit 6e973a6a0674ba70373eaab07afc7b822a3d82be.
Revert "Revert "Reversão de conflito""

This reverts commit f5a8aa8833104bcfdb06fdc4c347000524512908.
Revert "Reversão de conflito"

This reverts commit 6e973a6a0674ba70373eaab07afc7b822a3d82be.