Fix a Pull Request that has a Merge Conflict

If we try to make a pull request on github that has a conflict, there are a few ways to fix it.

We're going to first back out of the pull request, and then merge master into our feature branch.

We'll manage the merge conflict locally, and then do a new pull request (which will not have the conflict)