clean up merge cruft