GitHub repository: sanfreire/senai-versoes-colaboradores
Description: solucao de conflitos