try to merge settings update
merge