fix a merge derp