Remove merge cruft.