change settings
merge