Resolvido problema de merge