Merge of conf and dconf fixed.