update settings to match master