[gkop]

You probably know this but just to be clear, to resolve conflicts on your pull request branch, you may merge master into your branch or rebase that branch on master; GitHub makes sense of either kind of resolution.