fixed merge of settings