clean-up merge cruft.