How to resolve a conflict locally without actually merging the pull request

Question

I currently have a branch that is currently in a pull request back into master. There is a conflict with a couple of git markers that I would like to delete. But I do not want t