added settings update
merge