fix merge derp