merge issue

Basically I didn't merge and payed for it.. this fixes it