fix up slim merge