Commit 2, conflito 02 adicionado
Conflitos resolvidos
Conflitos resolvidos