fixing settings
fixed merge of settings