Clean up merge commit artifacts