GdxPay: Merge conflicts fixed.