modify config
fixbug
before merge
Merge remote-tracking branch 'origin/master'
modify config for template