@chrisisgr8 238: what. ok no. alright, i can fix this with two rebases, a hard reset, and a force push...

*cut to 2am, face illuminated by a screen of diffs*
mistakes were made