Revert "Conflitos"

This reverts commit a370a5f5361847b674bccb1ec5bc1cc80b6cd337.