I think that all are ok
arrumando conflitos
c
Merge branch 'master' of https://github.com/cfsbsi/Repository
atualizado