bugfix in zero.merge
Merge branch 'bugfix-zero.merge' into 'master'

Bugfix zero.merge

处理merge的时候数据类型冲突的问题