remove merge cruft