Delete merge cruft