update config
merge with master