rm leftover merge cruft