Fix diffmerge glitch.