change setting
other prop file
合并