I think you would need to rebase this PR on top of master, which would also mean resolving all the conflicts.
Carefully Proceed to fixing all the conflicts and then continue with:
git add . git rebase --continue
Once there are no conflicts, you can:
This can be avoided a little bit by making PRs with fewer files, the less the better.