solution map  元素类型
Merge remote-tracking branch 'origin/master'