Fix merge on payment