Revert "resolução de conflitos do merge"

This reverts commit 4ee7dfdaceeb0e9eac5d53d9b65c785fec68e01f.