Fixed minor merge glitches.