You create a PR on GitHub from feature-branch to main, but it can't be merged due to a conflict. How should you fix it?
- Send a strongly-worded email to the lead dev asking them to merge the PR
- Close the PR, create a new branch, fix the conflict, then create a new PR
- Pull to `main`, merge to `feature-branch`, then push `feature-branch`
- Check out the `main` branch, merge `feature-branch`, then push `main`