good catch, probably a bad merge, I'll fix that