remove payment
merge conflit