Cleaning up merge remnants.