resolve commits
resolvido novo conflito