change payment amount
resolve merge conflict