Clean up merge cruft