I think GitHub is confused...

After a merge it says my repo is six commits ahead of upstream, but that there are zero differences between the two. Creating this PR so that github will agree that they are in sync.