update basic setting
merge