master config
merge with origin