Remove merge cruft