fix merge config bug
Merge branch 'dev'