Merge payment models with 1.5.5.1