change alipay to 42
fix conflict