merge picking fixed disc_amount error