Fix merging glitches.
1 file changed