no idea

^ what this is. I'm just trying to merge the two existing pull requests into my own master. Not sure what it is doing here. Not sure what is going on at all, really. I'm really spending far more time wrangling with git than I'd rather be.