fix some glitches resulting from merge