GitHub repository: JeffersonRSoares/senai-versoes-colaboracoes
Description: Solucao de conflitos