Revert "remoção das strings de conflito do git dessa classe"

This reverts commit 7e7a51bb83f446805b816ab3cbab899600b1eef8.