Cleaning up merge (Learn2Git)