modify the setting_dev
merge