not sure why these weren't already committed
merge confict. SOMEBODY wasn't being responsible recently..