Jesus, I'm an idiot.

Fixed merge conflicts.