$ git merge origin/master $ pullme <snip> Do you want to submit a pull request to origin/master? [Yn] I'm not actually sure how to resolve this, but I'd like to if I can