updated settings
merged