[git] merged in work configs