fix derp in merge derp