Patch up weird merge things