homolog
resolvendo conflitos de merge