How do you resolve conflicts in a pull request?

When GitHub reports conflicts in a PR:

Fetch and switch to your branch locally:

git fetch origin

git checkout feature/new-ui