When a PR has "awaiting-review" & merge conflict then remove awaiting review label, add "resolving-merge-conflict" label, assign the author of the PR and add comment on the issue with "@username before proceeding with review, please resolve the merge conflict and then reassign."