That last commit message about silly mistakes pales in comparision to this one
I honestly wish I could remember what was going on here...
this is how we generate our shit.
Trying to fake a conflict