add the alipay conflict