Fix merged derp