fixed settings save
merge