merge EnterPaymentDetails.scala