Remove forgotten merge cruft.