Actually commit the no-scope-shadowing to . function