github pull request show conflicts