merge solucao baufaker