What do you think about adding a conflict indicator on the pull request list?
This will help to better manage PRs