derp in merge