merge derp fix