Merge conflict resolution
Teste A de commit sem add
Merge branch 'master' of https://github.com/MitiDev/teste