Damn merge conflicts… Fixed.