解决冲突
pay dialog