settings update
merge