Resolvendo conflitos
Revert "Resolvendo conflitos"

This reverts commit 4de4b4eaf19fd3027a0da082db8c69c661a26a9e.
Resolvendo conflitos
Resolvendo conflitos