merging in some configs from work machine