git pull request resolve merge conflicts