new update fix total payment
merge