update setting
conflict