reconfig settting files
merge from HEAD