Resolvendo problema de merge.