Weird merge stuff, this should fix it

At least, I think so