Fix merged derp again