解决pull request冲突