merge conflict
email correct payment request amount
duplicate payment field on Account