update work configs
merge conflict resolved