azure devops git pull request resolve conflicts