GitHub repository: Eduardo3224/senai-versoes-colaboracao
Description: soluçoes de conflito