corrigindo merge zuado