Manually merging Discount.php and PaymentMethod.php