Clean up merge remnants.