Merge branch 'master', remote-tracking branch 'origin'
fixed merge issue with template.go and duplicate `fmt` import