fix in payment controller
fixed merge