settings from work
fixed conflict
updated from work